commit 7365ed5e563cb1a9333d1e10fe9c7f72a606c357
author William Escande <wescande@google.com> Sat Jan 07 02:00:09 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 07 02:00:09 2023 +0000
tree 413cf3807645e07439b514a5d72f864d4bc7ca53
parent 1eadb6ed7b20ef8740be1b94e715ce8c8a021029
parent f66a13358ddce30a037f22fa0b4b25f31e2b402f

Merge "Remove deprecated call of EventLog" am: f66a13358d

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

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

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index 845975d..c8187b8 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -35,7 +35,6 @@
 import android.os.ParcelUuid;
 import android.os.SystemClock;
 import android.text.TextUtils;
-import android.util.EventLog;
 import android.util.Log;
 import android.util.LruCache;
 import android.util.Pair;
@@ -1020,14 +1019,7 @@
         if (BluetoothUuid.containsAnyUuid(uuids, PbapServerProfile.PBAB_CLIENT_UUIDS)) {
             // The pairing dialog now warns of phone-book access for paired devices.
             // No separate prompt is displayed after pairing.
-            if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_UNKNOWN) {
-                if (BluetoothUtils.isDeviceClassMatched(mDevice,
-                        BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE)
-                        || BluetoothUtils.isDeviceClassMatched(mDevice,
-                        BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET)) {
-                    EventLog.writeEvent(0x534e4554, "138529441", -1, "");
-                }
-            }
+            mDevice.getPhonebookAccessPermission();
         }
     }