commit 48f3a1657f8fdfcc4b953c6428249a3eab882afe
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 14 01:18:10 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 14 01:18:10 2022 +0000
tree df3e8e4824578d34f7e83e5d5ea8fc34f65f09cc
parent e8c4de13f4ff4b8da885626ff5a350f5c558ab52
parent 94c819f650c952058bb9a73dba49e500c901ffdb

Merge "Remove "@1.0" from android.system.suspend service's name" am: 15028dbe86 am: 94c819f650

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/2346884

Change-Id: I23fba2ecdd7030266a29b2e02b9f572b814ea5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

suspend/1.0/default/Android.bp

diff --git a/suspend/1.0/default/Android.bp b/suspend/1.0/default/Android.bp
index fed1ae6..83dadb9 100644
--- a/suspend/1.0/default/Android.bp
+++ b/suspend/1.0/default/Android.bp
@@ -49,8 +49,8 @@
         "system_suspend_defaults",
         "system_suspend_stats_defaults",
     ],
-    init_rc: ["android.system.suspend@1.0-service.rc"],
-    vintf_fragments: ["android.system.suspend@1.0-service.xml"],
+    init_rc: ["android.system.suspend-service.rc"],
+    vintf_fragments: ["android.system.suspend-service.xml"],
     shared_libs: [
         "android.system.suspend-V1-ndk",
         "android.system.suspend.control-V1-cpp",

suspend/1.0/default/android.system.suspend-service.rc

diff --git a/suspend/1.0/default/android.system.suspend@1.0-service.rc b/suspend/1.0/default/android.system.suspend-service.rc
similarity index 100%
rename from suspend/1.0/default/android.system.suspend@1.0-service.rc
rename to suspend/1.0/default/android.system.suspend-service.rc

suspend/1.0/default/android.system.suspend-service.xml

diff --git a/suspend/1.0/default/android.system.suspend@1.0-service.xml b/suspend/1.0/default/android.system.suspend-service.xml
similarity index 100%
rename from suspend/1.0/default/android.system.suspend@1.0-service.xml
rename to suspend/1.0/default/android.system.suspend-service.xml