Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa198f1a authored by Hemant Gupta's avatar Hemant Gupta Committed by Android Git Automerger
Browse files

am 9e90e3d5: PBAP: Remove the PBAP pop up in various scenarios 

* commit '9e90e3d5':
  PBAP: Remove the PBAP pop up in various scenarios
parents 3a239c1a 9e90e3d5

android/app/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ 
            <intent-filter>

                <action android:name="android.bluetooth.adapter.action.STATE_CHANGED"/>

                <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REPLY" />

                <action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </receiver>

android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java

100755 → 100644
+21 −1
Original line number Diff line number Diff line
@@ -256,6 +256,26 @@ public class BluetoothPbapService extends Service { 
            } else {

                removeTimeoutMsg = false;

            }

        } else if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED) &&

                   isWaitingAuthorization) {

            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);



            if (mRemoteDevice == null || device == null) {

                Log.e(TAG, "Unexpected error!");

                return;

            }



            if (DEBUG) Log.d(TAG,"ACL disconnected for "+ device);



            if (mRemoteDevice.equals(device)) {

                Intent cancelIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL);

                cancelIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);

                cancelIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,

                                      BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);

                sendBroadcast(cancelIntent);

                isWaitingAuthorization = false;

                stopObexServerSession();

            }

        } else if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY)) {

            int requestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,

                                           BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
@@ -646,7 +666,7 @@ public class BluetoothPbapService extends Service { 
                    break;

                case USER_TIMEOUT:

                    Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL);

                    intent.setClassName(ACCESS_AUTHORITY_PACKAGE, ACCESS_AUTHORITY_CLASS);

                    intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mRemoteDevice);

                    intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,

                                    BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);

                    sendBroadcast(intent);