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

Commit af47ed9a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch IAE in BluetoothManagerService" am: 21999f4d 

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



Change-Id: I715d12709241172ba710757c515a4db3d1d8a4a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83ce8468 21999f4d

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+5 −1
Original line number Diff line number Diff line
@@ -2189,7 +2189,11 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { 
                        break;

                    }

                    if (msg.arg1 > 0) {

                        try {

                            mContext.unbindService(psc);

                        } catch (IllegalArgumentException e) {

                            Log.e(TAG, "Unable to unbind service with intent: " + psc.mIntent, e);

                        }

                        psc.bindService(msg.arg1 - 1);

                    }

                    break;