summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-13 00:56:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-13 00:56:18 +0000
commitf0bcac5280718066ebc7771f5ceaecfa28bc4095 (patch)
treebeab5b0445f7cf1efc0f2765df947385fb77c94e
parent72ad627539c9e2249d0a10d28e37098599e88770 (diff)
parent027a9244f1d002f509df473e10ef1ab5bfa44250 (diff)
downloadpackages_apps_Settings-f0bcac5280718066ebc7771f5ceaecfa28bc4095.tar.gz
packages_apps_Settings-f0bcac5280718066ebc7771f5ceaecfa28bc4095.tar.bz2
packages_apps_Settings-f0bcac5280718066ebc7771f5ceaecfa28bc4095.zip
Merge "Update Bluetooth api" am: ff44a78145 am: 027a9244f1
Change-Id: I20311badde6c4335d407be7724d35bb7a6a95591
-rw-r--r--tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index 57fd86b25d..96378843e8 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -143,7 +143,8 @@ public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsCont
@Override
public int getPreferred(BluetoothDevice device) {
return isPreferred(device) ?
- BluetoothProfile.PRIORITY_ON : BluetoothProfile.PRIORITY_OFF;
+ BluetoothProfile.CONNECTION_POLICY_ALLOWED
+ : BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
}
@Override