PBAP: Fix to show authorization popup for FTP after PBAP

A case where PBAP connection was accepted before requesting
FTP connection from same remote device. So remote device was
authorized for all profiles & FTP connection is automatically
accepted. As PBAP have it's own authorization/trust mechanism
to store the user choice. So remote device should not be added
into NV trusted list(BD config file) while accepting PBAP/MAP
authorization request to solve this issue.

Conflicts:
	src/com/android/bluetooth/pbap/BluetoothPbapService.java

Change-Id: Icf781cfd93128058722d9f2ee1c070c3c8fe542d
CRs-Fixed: 568389

1 files changed, 2 insertions, 9 deletions

diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
index 90a5ea4ab..69f42c7b8 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -290,15 +290,8 @@ public class BluetoothPbapService extends Service {
             mIsWaitingAuthorization = false;
 
             if (intent.getIntExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
-                                   BluetoothDevice.CONNECTION_ACCESS_NO)
-                    == BluetoothDevice.CONNECTION_ACCESS_YES) {
-                if (intent.getBooleanExtra(BluetoothDevice.EXTRA_ALWAYS_ALLOWED, false)) {
-                    boolean result = mRemoteDevice.setPhonebookAccessPermission(
-                            BluetoothDevice.ACCESS_ALLOWED);
-                    if (VERBOSE) {
-                        Log.v(TAG, "setPhonebookAccessPermission(ACCESS_ALLOWED) result=" + result);
-                    }
-                }
+                                   BluetoothDevice.CONNECTION_ACCESS_NO) ==
+                BluetoothDevice.CONNECTION_ACCESS_YES) {
                 try {
                     if (mConnSocket != null) {
                         startObexServerSession();