commit eddd1b5e71510b8e4ab14f386203db2d936d856e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Aug 09 20:54:39 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Aug 09 20:54:39 2024 +0000
tree 4888fc4618e2f9de5dc5e7cc926dec7c0508c502
parent c6be5ac97bff2f6244bc5dcab2ea1eeb69f7282a
parent 13efb970b910e1b5c7ed479a85ee499f60f09ae0

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28293321'] into 24Q3-release.

Change-Id: Ie34a8d9ee199c400904f274ff3ec823ee23706d6

cpp/powerpolicy/server/carpowerpolicyd.xml

diff --git a/cpp/powerpolicy/server/carpowerpolicyd.xml b/cpp/powerpolicy/server/carpowerpolicyd.xml
index 45f084d..4893910 100644
--- a/cpp/powerpolicy/server/carpowerpolicyd.xml
+++ b/cpp/powerpolicy/server/carpowerpolicyd.xml
@@ -22,15 +22,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- TODO(b/301025020): Deprecate ICarPowerPolicySystemNotification -->
-    <hal format="aidl">
-        <name>android.frameworks.automotive.powerpolicy.internal</name>
-        <version>2</version>
-        <interface>
-            <name>ICarPowerPolicySystemNotification</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.automotive.powerpolicy.internal</name>
         <version>1</version>