diff --git a/Android.bp b/Android.bp
index 53f863e..3aa907b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,17 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+android_app_import {
+ name: "MotoDolbyDax3",
+ owner: "motorola",
+ apk: "proprietary/system/app/MotoDolbyDax3/MotoDolbyDax3.apk",
+ overrides: ["MusicFX"],
+ certificate: "platform",
+ dex_preopt: {
+ enabled: false,
+ },
+}
+
android_app_import {
name: "MotoSignatureApp",
owner: "motorola",
@@ -129,6 +140,7 @@ prebuilt_etc_xml {
filename_from_src: true,
sub_dir: "vintf/manifest",
soc_specific: true,
+
}
cc_prebuilt_binary {
@@ -167,3 +179,32 @@ cc_prebuilt_binary {
soc_specific: true,
}
+android_app_import {
+ name: "daxService",
+ owner: "motorola",
+ apk: "proprietary/system_ext/priv-app/daxService/daxService.apk",
+ certificate: "platform",
+ dex_preopt: {
+ enabled: false,
+ },
+ privileged: true,
+ system_ext_specific: true,
+}
+
+dex_import {
+ name: "com.motorola.frameworks.core.addon",
+ owner: "motorola",
+ jars: ["proprietary/system/framework/com.motorola.frameworks.core.addon.jar"],
+}
+
+dex_import {
+ name: "moto-checkin",
+ owner: "motorola",
+ jars: ["proprietary/system/framework/moto-checkin.jar"],
+}
+
+ dex_import {
+ name: "motoaudioeffectsdk",
+ owner: "motorola",
+ jars: ["proprietary/system/framework/motoaudioeffectsdk.jar"],
+}
diff --git a/eqs-vendor.mk b/eqs-vendor.mk
index 0792b96..2b8c8a5 100644
--- a/eqs-vendor.mk
+++ b/eqs-vendor.mk
@@ -6,6 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/motorola/eqs
PRODUCT_COPY_FILES += \
+ vendor/motorola/eqs/proprietary/product/etc/default-permissions/default-permissions-com.motorola.dolby.dolbyui.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions-com.motorola.dolby.dolbyui.xml \
vendor/motorola/eqs/proprietary/vendor/etc/permissions/com.motorola.camera3.content.ai.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.content.ai.xml \
vendor/motorola/eqs/proprietary/vendor/etc/permissions/com.motorola.camera3.eqs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.eqs.xml \
vendor/motorola/eqs/proprietary/vendor/etc/permissions/com.motorola.camera3.lens.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.camera3.lens.xml \
@@ -15,11 +16,17 @@ PRODUCT_COPY_FILES += \
vendor/motorola/eqs/proprietary/product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml \
vendor/motorola/eqs/proprietary/product/etc/permissions/privapp-permissions-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-com.motorola.camera3.xml \
vendor/motorola/eqs/proprietary/product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml \
+ vendor/motorola/eqs/proprietary/system/etc/permissions/com.motorola.dolby.dolbyui.dax3.features.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.motorola.dolby.dolbyui.dax3.features.xml \
+ vendor/motorola/eqs/proprietary/system/etc/permissions/com.motorola.frameworks.core.addon.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.motorola.frameworks.core.addon.xml \
vendor/motorola/eqs/proprietary/system/etc/permissions/com.motorola.motosignature.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/com.motorola.motosignature.xml \
+ vendor/motorola/eqs/proprietary/system/etc/permissions/moto-checkin.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-checkin.xml \
vendor/motorola/eqs/proprietary/system/etc/permissions/moto-core_services.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-core_services.xml \
vendor/motorola/eqs/proprietary/system/etc/permissions/moto-settings.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-settings.xml \
vendor/motorola/eqs/proprietary/system_ext/bin/motsettings:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/motsettings \
vendor/motorola/eqs/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
+ vendor/motorola/eqs/proprietary/system/etc/permissions/motoaudioeffectsdk.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/motoaudioeffectsdk.xml \
+ vendor/motorola/eqs/proprietary/system/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml \
+ vendor/motorola/eqs/proprietary/system_ext/etc/permissions/com.dolby.daxservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.dolby.daxservice.xml \
vendor/motorola/eqs/proprietary/vendor/bin/STFlashTool:$(TARGET_COPY_OUT_VENDOR)/bin/STFlashTool \
vendor/motorola/eqs/proprietary/vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets \
vendor/motorola/eqs/proprietary/vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/motorola.hardware.camera.desktop@2.0-service \
@@ -653,7 +660,12 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
android.hardware.secure_element@1.0-impl-gto \
+ MotoDolbyDax3 \
MotoSignatureApp \
+ daxService \
+ motoaudioeffectsdk \
+ com.motorola.frameworks.core.addon \
+ moto-checkin \
MotCamera3AI \
HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND \
HotwordEnrollmentXGoogleHEXAGON_WIDEBAND \
@@ -665,4 +677,4 @@ PRODUCT_PACKAGES += \
com.android.hotwordenrollment.common.util \
motorola.hardware.sensorext.service \
android.hardware.nfc@1.2-service.st \
- android.hardware.secure_element@1.2-service-gto
+ android.hardware.secure_element@1.2-service-gto
\ No newline at end of file
diff --git a/proprietary/product/etc/default-permissions/default-permissions-com.motorola.dolby.dolbyui.xml b/proprietary/product/etc/default-permissions/default-permissions-com.motorola.dolby.dolbyui.xml
new file mode 100644
index 0000000..09c3d90
--- /dev/null
+++ b/proprietary/product/etc/default-permissions/default-permissions-com.motorola.dolby.dolbyui.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/proprietary/system/app/MotoDolbyDax3/MotoDolbyDax3.apk b/proprietary/system/app/MotoDolbyDax3/MotoDolbyDax3.apk
new file mode 100644
index 0000000..aec8e7d
Binary files /dev/null and b/proprietary/system/app/MotoDolbyDax3/MotoDolbyDax3.apk differ
diff --git a/proprietary/system/etc/permissions/com.motorola.dolby.dolbyui.dax3.features.xml b/proprietary/system/etc/permissions/com.motorola.dolby.dolbyui.dax3.features.xml
new file mode 100644
index 0000000..5c2f55d
--- /dev/null
+++ b/proprietary/system/etc/permissions/com.motorola.dolby.dolbyui.dax3.features.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/proprietary/system/etc/permissions/com.motorola.frameworks.core.addon.xml b/proprietary/system/etc/permissions/com.motorola.frameworks.core.addon.xml
new file mode 100644
index 0000000..1d0a279
--- /dev/null
+++ b/proprietary/system/etc/permissions/com.motorola.frameworks.core.addon.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/proprietary/system/etc/permissions/moto-checkin.xml b/proprietary/system/etc/permissions/moto-checkin.xml
new file mode 100644
index 0000000..dfe2404
--- /dev/null
+++ b/proprietary/system/etc/permissions/moto-checkin.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/proprietary/system/etc/permissions/motoaudioeffectsdk.xml b/proprietary/system/etc/permissions/motoaudioeffectsdk.xml
new file mode 100644
index 0000000..0c3d3a1
--- /dev/null
+++ b/proprietary/system/etc/permissions/motoaudioeffectsdk.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/proprietary/system/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml b/proprietary/system/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml
new file mode 100644
index 0000000..3c55a12
--- /dev/null
+++ b/proprietary/system/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/proprietary/system/framework/com.motorola.frameworks.core.addon.jar b/proprietary/system/framework/com.motorola.frameworks.core.addon.jar
new file mode 100644
index 0000000..c055833
Binary files /dev/null and b/proprietary/system/framework/com.motorola.frameworks.core.addon.jar differ
diff --git a/proprietary/system/framework/moto-checkin.jar b/proprietary/system/framework/moto-checkin.jar
new file mode 100644
index 0000000..60ad7fd
Binary files /dev/null and b/proprietary/system/framework/moto-checkin.jar differ
diff --git a/proprietary/system/framework/motoaudioeffectsdk.jar b/proprietary/system/framework/motoaudioeffectsdk.jar
new file mode 100644
index 0000000..bc14b09
Binary files /dev/null and b/proprietary/system/framework/motoaudioeffectsdk.jar differ
diff --git a/proprietary/system_ext/etc/permissions/com.dolby.daxservice.xml b/proprietary/system_ext/etc/permissions/com.dolby.daxservice.xml
new file mode 100644
index 0000000..470677c
--- /dev/null
+++ b/proprietary/system_ext/etc/permissions/com.dolby.daxservice.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/proprietary/system_ext/priv-app/daxService/daxService.apk b/proprietary/system_ext/priv-app/daxService/daxService.apk
new file mode 100644
index 0000000..5bc9956
Binary files /dev/null and b/proprietary/system_ext/priv-app/daxService/daxService.apk differ