commit cac496efd469bb2debd72b55e9c1fbb2f3bb5fc6
author Frederick Mayle <fmayle@google.com> Wed Dec 07 16:59:40 2022 -0800
committer Frederick Mayle <fmayle@google.com> Mon Dec 12 16:47:34 2022 -0800
tree 4f64e69a3cfe68b3127c694e8ee2748e8a0291b0
parent 7a66421f3fc94c60414891fc0cbf08eced6723b2

Remove "@1.0" from android.system.suspend service's name

Bug: 232447926
Test: TH
Change-Id: I6e9da45689e0d5ed218c1b19bbab4e47ec3015f1

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