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

Commit b8e04462 authored by Hemant Gupta's avatar Hemant Gupta Committed by Steve Kondik
Browse files

Bluetooth: Fix to avoid framework reboot during monkey. 

A case where monkey is running & sometimes framework is
disconnected due to unhandled java Exception during the
unbinding of HID device service on unsuccessful unbinding.
Handling java Illegal Argument exception while unbinding
HID device service solves this issue.

Change-Id: I61a5620e756119d25f2a235e67d6404b216f4cbf
CRs-Fixed: 601533
parent 6ca9b98b

core/java/android/bluetooth/BluetoothHidDevice.java

+13 −3
Original line number Diff line number Diff line
@@ -151,8 +151,14 @@ public final class BluetoothHidDevice implements BluetoothProfile { 
            synchronized (mConnection) {

                if (!up) {

                    Log.d(TAG,"Unbinding service...");

                    if (mService != null) {

                        mService = null;

                        try {

                            mContext.unbindService(mConnection);

                        } catch (IllegalArgumentException e) {

                            Log.e(TAG,"onBluetoothStateChange: could not unbind service:", e);

                        }

                    }

                } else {

                    try {

                        if (mService == null) {
@@ -239,7 +245,11 @@ public final class BluetoothHidDevice implements BluetoothProfile { 
        synchronized (mConnection) {

            if (mService != null) {

                mService = null;

                try {

                    mContext.unbindService(mConnection);

                } catch (IllegalArgumentException e) {

                    Log.e(TAG,"close: could not unbind HID Dev service: ", e);

                }

           }

        }