summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-16 09:20:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-16 09:20:00 +0000
commita09a76a726c3decc2edeed6c5e1bb7d21e7c2612 (patch)
treeee8ee38a83093c74112b591379f96be6c4cf950f
parente4093ef3646e719ebb005652b812cee58ff0a812 (diff)
parent8bedbeb9b58eb31da0462c71a9bbbf0b05a685a3 (diff)
Merge "PBAP: Do not set phonebook access to ACCESS_REJECTED automatically" into tm-dev am: 4cd19a7ece am: 8bedbeb9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349816 Change-Id: I6842fd893aeb361c9838e50e3717e3db27c5d755 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index 4229b6881f73..a9da2e0bfebe 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -1018,7 +1018,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
== BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET)) {
EventLog.writeEvent(0x534e4554, "138529441", -1, "");
}
- mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
}
}
}