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

Commit ab455da3 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "handle NullPointerException in cases where a proxy call to... 

Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev
parents 0590c1b6 305f240d

core/java/android/bluetooth/BluetoothDevice.java

+6 −0
Original line number Diff line number Diff line
@@ -786,6 +786,12 @@ public final class BluetoothDevice implements Parcelable { 
        try {

            return sService.getBondState(this);

        } catch (RemoteException e) {Log.e(TAG, "", e);}

        catch (NullPointerException npe) {

            // Handle case where bluetooth service proxy

            // is already null.

            Log.e(TAG, "NullPointerException for getBondState() of device ("+

                getAddress()+")", npe);

        }

        return BOND_NONE;

    }