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

Commit 8e23d5c3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Bluetooth: Add NULL check before accessing Profile data"

parents c107026b 653235b3

src/com/android/bluetooth/a2dp/A2dpService.java

+6 −2
Original line number Diff line number Diff line
@@ -67,8 +67,12 @@ public class A2dpService extends ProfileService { 
    }



    protected boolean stop() {

        if (mStateMachine != null) {

            mStateMachine.doQuit();

        }

        if (mAvrcp != null) {

            mAvrcp.doQuit();

        }

        return true;

    }

src/com/android/bluetooth/hdp/HealthService.java

+6 −4
Original line number Diff line number Diff line
@@ -100,11 +100,13 @@ public class HealthService extends ProfileService { 
    }



    protected boolean stop() {

        if(mHandler != null) {

            mHandler.removeCallbacksAndMessages(null);

            Looper looper = mHandler.getLooper();

            if (looper != null) {

                looper.quit();

            }

        }

        cleanupApps();

        return true;

    }

src/com/android/bluetooth/hfp/HeadsetService.java

+3 −1
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ public class HeadsetService extends ProfileService { 
        } catch (Exception e) {

            Log.w(TAG,"Unable to unregister headset receiver",e);

        }

        if (mStateMachine != null) {

            mStateMachine.doQuit();

        }

        return true;

    }

src/com/android/bluetooth/hfpclient/HandsfreeClientService.java

+3 −1
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ public class HandsfreeClientService extends ProfileService { 
        } catch (Exception e) {

            Log.w(TAG, "Unable to unregister broadcast receiver", e);

        }

        if (mStateMachine != null) {

            mStateMachine.doQuit();

        }

        return true;

    }