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

Commit 7758e9fb authored by Ray Kuo's avatar Ray Kuo Committed by android-build-merger
Browse files

Merge "OPP: Fix the NPE in OPP service when stop() is called before start()."... 

Merge "OPP: Fix the NPE in OPP service when stop() is called before start()." am: e7100506 am: e49e2c81
am: c3414d48

Change-Id: If01d5be5cff26ff3157810a3946718bb940965ad
parents d6201c68 c3414d48

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

+4 −0
Original line number Diff line number Diff line
@@ -243,6 +243,10 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 


    @Override

    public boolean stop() {

        if (sBluetoothOppService == null) {

            Log.w(TAG, "stop() called before start()");

            return true;

        }

        setBluetoothOppService(null);

        mHandler.sendMessage(mHandler.obtainMessage(STOP_LISTENER));

        return true;