Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9881ae6f authored by Zongheng Wang's avatar Zongheng Wang Committed by android-build-merger
Browse files

Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose... 

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

Change-Id: I13b829e47467688aba67f22d9fe50bf1251539b2
parents e39e591a e71322ef

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

+3 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.SharedPreferences; 
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 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
                        == 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);

            }

        }

    }