MAP: Handle EXTRA_ALWAYS_ALLOWED flag and setMessageAccessPermission.

Set MessageAccessPermission sharedPreference for MAP authorization
as per EXTRA_ALWAYS_ALLOWED flag indicated in ACTION_CONNECTION_ACCESS_REPLY
from Settings authority package.

Change-Id: I9e4c5e058aa3f27898ae9be0540d19d704e22bb3
CRs-fixed: 739535

1 files changed, 15 insertions, 3 deletions

diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index 7736f6429..6d7579b3f 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -1046,6 +1046,12 @@ public class BluetoothMapService extends ProfileService {
                                        BluetoothDevice.CONNECTION_ACCESS_NO) ==
                     BluetoothDevice.CONNECTION_ACCESS_YES) {
                     //bluetooth connection accepted by user
+                    if (intent.getBooleanExtra(BluetoothDevice.EXTRA_ALWAYS_ALLOWED, false)) {
+                        boolean result = mRemoteDevice.setMessageAccessPermission(
+                                BluetoothDevice.ACCESS_ALLOWED);
+                        if( DEBUG) Log.d(TAG, "setMessageAccessPermission(ACCESS_ALLOWED) result="
+                           + result);
+                    }
 
                     if(mIsEmailEnabled) {
                       //  todo updateEmailAccount();
@@ -1053,9 +1059,15 @@ public class BluetoothMapService extends ProfileService {
                     if (DEBUG) Log.d(TAG, "calling initiateObexServerSession");
                     mConnectionManager.initiateObexServerSession(mRemoteDevice);
 
-                        } else {
-                    Log.d(TAG, "calling stopObexServerSessionWaiting");
-                    mConnectionManager.stopObexServerSessionWaiting();
+                } else {
+                    if (intent.getBooleanExtra(BluetoothDevice.EXTRA_ALWAYS_ALLOWED, false)) {
+                        boolean result = mRemoteDevice.setMessageAccessPermission(
+                               BluetoothDevice.ACCESS_REJECTED);
+                        if(DEBUG) Log.d(TAG, "setMessageAccessPermission(ACCESS_REJECTED) result="
+                            +result);
+                    }
+                   Log.d(TAG, "calling stopObexServerSessionWaiting");
+                   mConnectionManager.stopObexServerSessionWaiting();
                 }
             } else if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED) &&
                     isWaitingAuthorization) {