Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-11 00:46:54 +00:00
committed by Android (Google) Code Review
parent a6ce09aaec 9b3cb0f06b
commit 20d46e4bf1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -27,6 +27,7 @@ import android.media.AudioManager;
import android.os.ParcelUuid; import android.os.ParcelUuid;
import android.os.SystemClock; import android.os.SystemClock;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
@@ -963,10 +964,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
== BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE || == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE ||
mDevice.getBluetoothClass().getDeviceClass() mDevice.getBluetoothClass().getDeviceClass()
== BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET) { == BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET) {
setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED); EventLog.writeEvent(0x534e4554, "138529441", -1, "");
} else {
setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
} }
setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
} }
} }
} }