msm8996-common: Update poweroff alarm and time services from LA.UM.8.6.r1-01900-89xx.0

13 files changed, 7 insertions, 7 deletions

diff --git a/msm8996-common/Android.bp b/msm8996-common/Android.bp
index e08c8ec..b10d28d 100644
--- a/msm8996-common/Android.bp
+++ b/msm8996-common/Android.bp
@@ -133,9 +133,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "PowerOffAlarm",
+	name: "TimeService",
 	owner: "zuk",
-	apk: "proprietary/vendor/app/PowerOffAlarm/PowerOffAlarm.apk",
+	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -144,14 +144,14 @@ android_app_import {
 }
 
 android_app_import {
-	name: "TimeService",
+	name: "PowerOffAlarm",
 	owner: "zuk",
-	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
+	apk: "proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	soc_specific: true,
+	product_specific: true,
 }
 
 dex_import {
diff --git a/msm8996-common/msm8996-common-vendor.mk b/msm8996-common/msm8996-common-vendor.mk
index 4700750..c553d2b 100644
--- a/msm8996-common/msm8996-common-vendor.mk
+++ b/msm8996-common/msm8996-common-vendor.mk
@@ -59,7 +59,6 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/framework/qti-telephony-common.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/qti-telephony-common.jar \
     vendor/zuk/msm8996-common/proprietary/framework/tcmclient.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/tcmclient.jar \
     vendor/zuk/msm8996-common/proprietary/framework/vendor.qti.data.factory-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/vendor.qti.data.factory-V1.0-java.jar \
-    vendor/zuk/msm8996-common/proprietary/framework/vendor.qti.hardware.alarm-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/vendor.qti.hardware.alarm-V1.0-java.jar \
     vendor/zuk/msm8996-common/proprietary/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar \
     vendor/zuk/msm8996-common/proprietary/framework/vendor.qti.hardware.data.latency-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/vendor.qti.hardware.data.latency-V1.0-java.jar \
     vendor/zuk/msm8996-common/proprietary/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar:$(TARGET_COPY_OUT_SYSTEM)/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar \
@@ -129,6 +128,7 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.hardware.fm@1.0.so \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.hardware.tui_comm@1.0.so \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.imsrtpservice@1.0.so \
+    vendor/zuk/msm8996-common/proprietary/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/vendor.qti.hardware.alarm-V1.0-java.jar \
     vendor/zuk/msm8996-common/proprietary/product/lib/vendor.display.color@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.display.color@1.0.so \
     vendor/zuk/msm8996-common/proprietary/product/lib/vendor.display.postproc@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.display.postproc@1.0.so \
     vendor/zuk/msm8996-common/proprietary/product/lib/vendor.qti.hardware.qdutils_disp@1.0.so:$(TARGET_COPY_OUT_PRODUCT)/lib/vendor.qti.hardware.qdutils_disp@1.0.so \
@@ -685,6 +685,6 @@ PRODUCT_PACKAGES += \
     dpmserviceapp \
     ims \
     qcrilmsgtunnel \
-    PowerOffAlarm \
     TimeService \
+    PowerOffAlarm \
     WfdCommon
diff --git a/msm8996-common/proprietary/framework/vendor.qti.hardware.alarm-V1.0-java.jar b/msm8996-common/proprietary/framework/vendor.qti.hardware.alarm-V1.0-java.jar
deleted file mode 100644
index 940c339..0000000
--- a/msm8996-common/proprietary/framework/vendor.qti.hardware.alarm-V1.0-java.jar
+++ /dev/null
diff --git a/msm8996-common/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk b/msm8996-common/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
new file mode 100644
index 0000000..b5611e6
--- /dev/null
+++ b/msm8996-common/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
diff --git a/msm8996-common/proprietary/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar b/msm8996-common/proprietary/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar
new file mode 100644
index 0000000..56d7ea1
--- /dev/null
+++ b/msm8996-common/proprietary/product/framework/vendor.qti.hardware.alarm-V1.0-java.jar
diff --git a/msm8996-common/proprietary/vendor/app/PowerOffAlarm/PowerOffAlarm.apk b/msm8996-common/proprietary/vendor/app/PowerOffAlarm/PowerOffAlarm.apk
deleted file mode 100644
index b4d49ed..0000000
--- a/msm8996-common/proprietary/vendor/app/PowerOffAlarm/PowerOffAlarm.apk
+++ /dev/null
diff --git a/msm8996-common/proprietary/vendor/app/TimeService/TimeService.apk b/msm8996-common/proprietary/vendor/app/TimeService/TimeService.apk
index 462fcaa..1d401f8 100644
--- a/msm8996-common/proprietary/vendor/app/TimeService/TimeService.apk
+++ b/msm8996-common/proprietary/vendor/app/TimeService/TimeService.apk
diff --git a/msm8996-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service b/msm8996-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
index 5094ecc..9afac14 100644
--- a/msm8996-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
+++ b/msm8996-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
diff --git a/msm8996-common/proprietary/vendor/bin/time_daemon b/msm8996-common/proprietary/vendor/bin/time_daemon
index fbea58a..85a93d1 100755
--- a/msm8996-common/proprietary/vendor/bin/time_daemon
+++ b/msm8996-common/proprietary/vendor/bin/time_daemon
diff --git a/msm8996-common/proprietary/vendor/lib/libtime_genoff.so b/msm8996-common/proprietary/vendor/lib/libtime_genoff.so
index 813799d..ac7bdca 100644
--- a/msm8996-common/proprietary/vendor/lib/libtime_genoff.so
+++ b/msm8996-common/proprietary/vendor/lib/libtime_genoff.so
diff --git a/msm8996-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so b/msm8996-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
index 285ed33..43e79e7 100644
--- a/msm8996-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
+++ b/msm8996-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
diff --git a/msm8996-common/proprietary/vendor/lib64/libtime_genoff.so b/msm8996-common/proprietary/vendor/lib64/libtime_genoff.so
index 9806626..08d9c7e 100644
--- a/msm8996-common/proprietary/vendor/lib64/libtime_genoff.so
+++ b/msm8996-common/proprietary/vendor/lib64/libtime_genoff.so
diff --git a/msm8996-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so b/msm8996-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so
index 75ca17b..d872b39 100644
--- a/msm8996-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so
+++ b/msm8996-common/proprietary/vendor/lib64/vendor.qti.hardware.alarm@1.0.so