commit 230b2877264b0a1b4b03b0b699cc515d94a75a94
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 24 03:43:34 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 24 03:43:34 2022 +0000
tree 67d35947c4be166825c14f9bbc7944ee3f03d748
parent cc7f77e40624071d709bf0034c7c3eb6321ef303
parent 5d7c674a578146d7e315eefb71911e1abeebe31b

Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test: atest ServiceBluetoothTests" am: 698946dd4e am: 5d7c674a57

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2192274

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

proto/src/system_messages.proto

diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto
index dfa34bb..b87773b 100644
--- a/proto/src/system_messages.proto
+++ b/proto/src/system_messages.proto
@@ -290,6 +290,10 @@
     // Package: android
     NOTE_REVIEW_NOTIFICATION_PERMISSIONS = 71;
 
+    // Inform the user of bluetooth apm state changes.
+    // Package: android
+    NOTE_BT_APM_NOTIFICATION = 74;
+
     // ADD_NEW_IDS_ABOVE_THIS_LINE
     // Legacy IDs with arbitrary values appear below
     // Legacy IDs existed as stable non-conflicting constants prior to the O release