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

Commit a108fac4 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Catch exceptions in SapServer" am: e44114d9 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2627949



Change-Id: I4e0f4899004691c901a5c7aa1123b6934a4a0e99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e61d77eb e44114d9

android/app/src/com/android/bluetooth/sap/SapServer.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -513,7 +513,11 @@ public class SapServer extends Thread implements Callback { 
            }

            }





            if (mIntentReceiver != null) {

            if (mIntentReceiver != null) {

                try {

                    mContext.unregisterReceiver(mIntentReceiver);

                    mContext.unregisterReceiver(mIntentReceiver);

                } catch (IllegalArgumentException e) {

                    Log.w(TAG, e);

                }

                mIntentReceiver = null;

                mIntentReceiver = null;

            }

            }

            stopDisconnectTimer();

            stopDisconnectTimer();