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

Commit 5eff03ff authored by Hemant Gutpa's avatar Hemant Gutpa Committed by android-build-merger
Browse files

Merge "PBAP: Set Pbap connection state to DISCONNECTED on ACL_DISCONNECT." am:... 

Merge "PBAP: Set Pbap connection state to DISCONNECTED on ACL_DISCONNECT." am: c2ff9eda am: c2459f8c am: 589a833c
am: 9d55d982

Change-Id: I46378e0ddf879724a31bfff3ba80c959ec6f99cd
parents 642ac12b 9d55d982

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

+5 −4
Original line number Diff line number Diff line
@@ -266,15 +266,16 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 
            return;

        }



        if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED) && mIsWaitingAuthorization) {

        if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {

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



            if (mRemoteDevice == null) return;

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

            if (mRemoteDevice.equals(device)) {

            if (mIsWaitingAuthorization && mRemoteDevice.equals(device)) {

                mSessionStatusHandler.removeMessages(USER_TIMEOUT);

                mSessionStatusHandler.obtainMessage(USER_TIMEOUT).sendToTarget();

            }

            mSessionStatusHandler.obtainMessage(MSG_SERVERSESSION_CLOSE).sendToTarget();

            return;

        }
@@ -305,7 +306,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 
                    if (mConnSocket != null) {

                        startObexServerSession();

                    } else {

                        stopObexServerSession();

                        mSessionStatusHandler.obtainMessage(MSG_SERVERSESSION_CLOSE).sendToTarget();

                    }

                } catch (IOException ex) {

                    Log.e(TAG, "Caught the error: " + ex.toString());
@@ -318,7 +319,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 
                        Log.v(TAG, "setPhonebookAccessPermission(ACCESS_REJECTED)=" + result);

                    }

                }

                stopObexServerSession();

                mSessionStatusHandler.obtainMessage(MSG_SERVERSESSION_CLOSE).sendToTarget();

            }

            return;

        }