commit 75f0072c94fab757d70d435d615e3e0ca24fc8b8
author Atanas Kirilov <akirilov@google.com> Mon Jun 04 20:24:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 04 20:24:37 2018 +0000
tree 190bee8fad399810242dbee88df12615f5d72a60
parent 438cf9da5223b1b430e4082b8b2b7f271bad81be
parent 81573c9301ba952e8abab70ec5388903b3427c9f

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 skipped: c874b450af
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text

src/com/android/settings/bluetooth/BluetoothPairingController.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index ce82612..d06cb7e 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -57,6 +57,7 @@
     private int mPasskey;
     private String mDeviceName;
     private LocalBluetoothProfile mPbapClientProfile;
+    private boolean mPbapAllowed;
 
     /**
      * Creates an instance of a BluetoothPairingController.
@@ -87,15 +88,20 @@
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (isChecked) {
-            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+            mPbapAllowed = true;
         } else {
-            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+            mPbapAllowed = false;
         }
     }
 
     @Override
     public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) {
         if (getDialogType() == USER_ENTRY_DIALOG) {
+            if (mPbapAllowed) {
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+            } else {
+                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+            }
             onPair(mUserInput);
         } else {
             onPair(null);
@@ -104,6 +110,7 @@
 
     @Override
     public void onDialogNegativeClick(BluetoothPairingDialogFragment dialog) {
+        mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
         onCancel();
     }