Merge "Remove deprecated call of EventLog" am: f66a13358d am: 7365ed5e56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378468 Change-Id: Ic05fe6379f846e9f2e3995a58c0727e2e5539978 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -35,7 +35,6 @@ import android.os.Message;
|
||||
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;
|
||||
@@ -1026,14 +1025,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user