diff --git a/Android.mk b/Android.mk
index ff2b358..6153aaf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,4 +18,28 @@ LOCAL_PATH := $(call my-dir)
ifeq ($(TARGET_DEVICE),sanders)
+include $(CLEAR_VARS)
+LOCAL_MODULE := daxService
+LOCAL_MODULE_OWNER := motorola
+LOCAL_SRC_FILES := proprietary/product/priv-app/daxService/daxService.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_SPECIFIC := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := MotoDolbyV3
+LOCAL_MODULE_OWNER := motorola
+LOCAL_SRC_FILES := proprietary/app/MotoDolbyV3/MotoDolbyV3.apk
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+include $(BUILD_PREBUILT)
+
endif
diff --git a/proprietary/app/MotoDolbyV3/MotoDolbyV3.apk b/proprietary/app/MotoDolbyV3/MotoDolbyV3.apk
new file mode 100644
index 0000000..07a88bc
Binary files /dev/null and b/proprietary/app/MotoDolbyV3/MotoDolbyV3.apk differ
diff --git a/proprietary/etc/permissions/com.dolby.daxservice.xml b/proprietary/etc/permissions/com.dolby.daxservice.xml
new file mode 100644
index 0000000..6b8bd09
--- /dev/null
+++ b/proprietary/etc/permissions/com.dolby.daxservice.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/proprietary/etc/permissions/com.motorola.dolby.dolbyui.features.xml b/proprietary/etc/permissions/com.motorola.dolby.dolbyui.features.xml
new file mode 100644
index 0000000..59f14d9
--- /dev/null
+++ b/proprietary/etc/permissions/com.motorola.dolby.dolbyui.features.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/proprietary/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml b/proprietary/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml
new file mode 100644
index 0000000..3c55a12
--- /dev/null
+++ b/proprietary/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/proprietary/product/priv-app/daxService/daxService.apk b/proprietary/product/priv-app/daxService/daxService.apk
new file mode 100644
index 0000000..97cbd17
Binary files /dev/null and b/proprietary/product/priv-app/daxService/daxService.apk differ
diff --git a/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service b/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service
new file mode 100644
index 0000000..351b12f
Binary files /dev/null and b/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service differ
diff --git a/proprietary/vendor/etc/dolby/dax-default.xml b/proprietary/vendor/etc/dolby/dax-default.xml
new file mode 100644
index 0000000..2de3baf
--- /dev/null
+++ b/proprietary/vendor/etc/dolby/dax-default.xml
@@ -0,0 +1,1171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - 16
+ - 48
+ - 48
+ - 16
+ - -16
+ - -80
+ - -112
+ - -112
+ - -112
+ - -112
+ - -112
+ - -112
+ - -80
+ - -80
+ - -80
+ - -16
+ - 16
+ - 48
+ - 48
+ - 48
+
+
+
+
+ - 3
+ - 48
+ - 48
+ - -6
+ - -16
+ - -48
+ - -48
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+ - -144
+
+
+
+
+ - -144
+ - -144
+ - 10
+ - -80
+ - -112
+ - -112
+ - -80
+ - -16
+ - 48
+ - 48
+ - 16
+ - -3
+ - -16
+ - -16
+ - -48
+ - -96
+ - -144
+ - -144
+ - -144
+ - -144
+
+
+
+
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+ - -48
+
+
+
+
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+
+
+
+
diff --git a/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc b/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc
new file mode 100644
index 0000000..558b937
--- /dev/null
+++ b/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc
@@ -0,0 +1,6 @@
+service dms-hal-1-0 /vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service
+ class hal
+ user media
+ group audio media
+on boot
+ mkdir /data/vendor/dolby 0770 media media
diff --git a/proprietary/vendor/lib/libdapparamstorage.so b/proprietary/vendor/lib/libdapparamstorage.so
new file mode 100644
index 0000000..9d11c7f
Binary files /dev/null and b/proprietary/vendor/lib/libdapparamstorage.so differ
diff --git a/proprietary/vendor/lib/libstagefrightdolby.so b/proprietary/vendor/lib/libstagefrightdolby.so
new file mode 100644
index 0000000..357759e
Binary files /dev/null and b/proprietary/vendor/lib/libstagefrightdolby.so differ
diff --git a/proprietary/vendor/lib/soundfx/libswdap.so b/proprietary/vendor/lib/soundfx/libswdap.so
new file mode 100644
index 0000000..f575340
Binary files /dev/null and b/proprietary/vendor/lib/soundfx/libswdap.so differ
diff --git a/proprietary/vendor/lib/vendor.dolby.hardware.dms@1.0.so b/proprietary/vendor/lib/vendor.dolby.hardware.dms@1.0.so
new file mode 100644
index 0000000..b90c96f
Binary files /dev/null and b/proprietary/vendor/lib/vendor.dolby.hardware.dms@1.0.so differ
diff --git a/proprietary/vendor/lib64/libdapparamstorage.so b/proprietary/vendor/lib64/libdapparamstorage.so
new file mode 100644
index 0000000..5174dfa
Binary files /dev/null and b/proprietary/vendor/lib64/libdapparamstorage.so differ
diff --git a/proprietary/vendor/lib64/libdlbdsservice.so b/proprietary/vendor/lib64/libdlbdsservice.so
new file mode 100644
index 0000000..5ed890f
Binary files /dev/null and b/proprietary/vendor/lib64/libdlbdsservice.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libswdap.so b/proprietary/vendor/lib64/soundfx/libswdap.so
new file mode 100644
index 0000000..c9c7ce6
Binary files /dev/null and b/proprietary/vendor/lib64/soundfx/libswdap.so differ
diff --git a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so
new file mode 100644
index 0000000..e99e877
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so differ
diff --git a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so
new file mode 100644
index 0000000..c960215
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so differ
diff --git a/sanders-vendor.mk b/sanders-vendor.mk
index b0d032f..f9b1146 100644
--- a/sanders-vendor.mk
+++ b/sanders-vendor.mk
@@ -1447,6 +1447,24 @@ PRODUCT_COPY_FILES += \
vendor/motorola/sanders/proprietary/vendor/radio/qcril_database/upgrade/3_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/3_version_qcrildb.sql \
vendor/motorola/sanders/proprietary/vendor/radio/qcril_database/upgrade/4_version_qcrildb.sql:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/upgrade/4_version_qcrildb.sql
+# MotoDolby
+PRODUCT_COPY_FILES += \
+ vendor/motorola/sanders/proprietary/etc/permissions/com.motorola.dolby.dolbyui.features.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.motorola.dolby.dolbyui.features.xml \
+ vendor/motorola/sanders/proprietary/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml \
+ vendor/motorola/sanders/proprietary/etc/permissions/com.dolby.daxservice.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.dolby.daxservice.xml \
+ vendor/motorola/sanders/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.dolby.hardware.dms@1.0-service \
+ vendor/motorola/sanders/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.hardware.dms@1.0-service.rc \
+ vendor/motorola/sanders/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
+ vendor/motorola/sanders/proprietary/vendor/lib/libdapparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdapparamstorage.so \
+ vendor/motorola/sanders/proprietary/vendor/lib/libstagefrightdolby.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefrightdolby.so \
+ vendor/motorola/sanders/proprietary/vendor/lib/vendor.dolby.hardware.dms@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.dolby.hardware.dms@1.0.so \
+ vendor/motorola/sanders/proprietary/vendor/lib/soundfx/libswdap.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libswdap.so \
+ vendor/motorola/sanders/proprietary/vendor/lib64/libdapparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdapparamstorage.so \
+ vendor/motorola/sanders/proprietary/vendor/lib64/libdlbdsservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdlbdsservice.so \
+ vendor/motorola/sanders/proprietary/vendor/lib64/soundfx/libswdap.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libswdap.so \
+ vendor/motorola/sanders/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.dolby.hardware.dms@1.0-impl.so \
+ vendor/motorola/sanders/proprietary/vendor/lib64/vendor.dolby.hardware.dms@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.dolby.hardware.dms@1.0.so
+
PRODUCT_PACKAGES += \
vendor.qti.hardware.fm@1.0 \
libqct_resampler \
@@ -1462,4 +1480,6 @@ PRODUCT_PACKAGES += \
qcrilmsgtunnel \
TimeService \
WfdCommon \
+ daxService \
+ MotoDolbyV3 \
com.fingerprints.extension