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

Commit d7980655 authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "MAP: Synchronize notifcationReg reply and MNS connect action." 

am: 075283fe

* commit '075283fe':
  MAP: Synchronize notifcationReg reply and MNS connect action.
parents 421d92eb 075283fe

src/com/android/bluetooth/map/BluetoothMapAccountLoader.java

+2 −1
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ public class BluetoothMapAccountLoader { 
                    " - returning empty account list" );

            return children;

        } finally {

            if (mProviderClient != null)

                mProviderClient.release();

        }

src/com/android/bluetooth/map/BluetoothMnsObexClient.java

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class BluetoothMnsObexClient { 
    /**

     * Shutdown the MNS.

     */

    public void shutdown() {

    public synchronized void shutdown() {

        /* should shutdown handler thread first to make sure

         * handleRegistration won't be called when disconnect

         */
@@ -178,7 +178,7 @@ public class BluetoothMnsObexClient { 
     * @param masId

     * @param notificationStatus

     */

    public void handleRegistration(int masId, int notificationStatus){

    public synchronized void handleRegistration(int masId, int notificationStatus){

        if(D) Log.d(TAG, "handleRegistration( " + masId + ", " + notificationStatus + ")");



        if(notificationStatus == BluetoothMapAppParams.NOTIFICATION_STATUS_NO) {