commit 596b6f71b4b32bf51a734d37d8ad3663f0478d9b
author Zongheng Wang <wangzongheng@google.com> Tue Sep 10 18:15:58 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 10 18:15:58 2019 -0700
tree b96d17b2fe44eb04b265b9c4d9e985d2e5bb774b
parent 18bf694f3c704f57de3bfbb5d4d9cece33053965
parent 4e4b2875d57e387cbe1651f9ab5f7c690115defa

Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into qt-dev
am: 4e4b2875d5

Change-Id: I370cf06dd4cf268663a062b0b0d7cd4dea6dd0e2

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 9a95288..8f164f1 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -27,6 +27,7 @@
 import android.os.ParcelUuid;
 import android.os.SystemClock;
 import android.text.TextUtils;
+import android.util.EventLog;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
@@ -804,10 +805,9 @@
                         == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE ||
                     mDevice.getBluetoothClass().getDeviceClass()
                         == BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET) {
-                    mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
-                } else {
-                    mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+                    EventLog.writeEvent(0x534e4554, "138529441", -1, "");
                 }
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
             }
         }
     }