commit 1c4b09920e8146de817b439f3ba70b64623274cf
author Janardhana Rao Bokka <jbokka@codeaurora.org> Wed Aug 07 15:40:34 2019 +0530
committer Janardhana Rao Bokka <jbokka@codeaurora.org> Thu Aug 22 21:04:16 2019 +0530
tree 621158648cd8c5009c1d84c8e2b15d57863c42a4
parent 884cc911daa8bcf0c377f6933567897ba10fa50f

BA: Handling null check condition when BT on and OFF happening

Handling null check conditions. When it is continuous BT ON/OFF
there is a race condition triggering NULL point exception in
GattBroadcast service.

Change-Id: I4a8def7d7e2e27b82ea788c02c0e5924db480f2f

packages_apps_bluetooth_ext/src/ba/BATService.java

diff --git a/packages_apps_bluetooth_ext/src/ba/BATService.java b/packages_apps_bluetooth_ext/src/ba/BATService.java
index 5f6a01b..d65eda5 100644
--- a/packages_apps_bluetooth_ext/src/ba/BATService.java
+++ b/packages_apps_bluetooth_ext/src/ba/BATService.java
@@ -301,8 +301,10 @@
                         BluetoothAdapter.ERROR);
                 if (state == BluetoothAdapter.STATE_BLE_ON || state == BluetoothAdapter.STATE_ON) {
                     Log.d(TAG,"ACTION_BLE_STATE_CHANGED state: " + state);
-                    mGattBroadcastService = new GattBroadcastService();
-                    mGattBroadcastService.start(getApplicationContext());
+                    if (mGattBroadcastService == null) {
+                        mGattBroadcastService = new GattBroadcastService();
+                        mGattBroadcastService.start(getApplicationContext());
+                    }
                 }
             }
         }
@@ -420,6 +422,7 @@
 
         if(mGattBroadcastService != null) {
             mGattBroadcastService.stop();
+            mGattBroadcastService = null;
         }
         Log.d(TAG, "BATService :: stop - ");
         return true;

packages_apps_bluetooth_ext/src/ba/GattBroadcastService.java

diff --git a/packages_apps_bluetooth_ext/src/ba/GattBroadcastService.java b/packages_apps_bluetooth_ext/src/ba/GattBroadcastService.java
index cef1810..b77e501 100644
--- a/packages_apps_bluetooth_ext/src/ba/GattBroadcastService.java
+++ b/packages_apps_bluetooth_ext/src/ba/GattBroadcastService.java
@@ -1290,25 +1290,29 @@
             addState(mBRADisabledStreamingActive);
             addState(mBRAEnabledStreamingPaused);
             addState(mBRAEnabledStreamingActive);
-
-            if (mBATService.getBATState() == BATService.STATE_PLAYING) {
-                setInitialState(mBRADisabledStreamingActive);
-                int div = mBATService.getDIV();
-                Log.d("GattBroadcastServiceStateMachine:", "div = " + div);
-                if (div != -1) {
-                    mBleAdvertiser.setDiv(div);
+            if (mBATService != null) {
+                if (mBATService.getBATState() == BATService.STATE_PLAYING) {
+                    setInitialState(mBRADisabledStreamingActive);
+                    int div = mBATService.getDIV();
+                    Log.d("GattBroadcastServiceStateMachine:", "div = " + div);
+                    if (div != -1 && mBleAdvertiser != null) {
+                        mBleAdvertiser.setDiv(div);
+                    }
+                    if (mBleAdvertiser != null) {
+                        mBleAdvertiser.stopAdvertising();
+                        Log.d("GattBroadcastServiceStateMachine:",
+                            " starting advertising");
+                        mBleAdvertiser.startAdvertising(false,
+                            BleAdvertiser.BRA_DISABLED_STREAMING_ACTIVE_ADV_INTERVAL);
+                    }
                 }
-                if (mBleAdvertiser != null) {
-                    mBleAdvertiser.stopAdvertising();
-                    Log.d("GattBroadcastServiceStateMachine:"," starting advertising");
-                    mBleAdvertiser.startAdvertising(false,
-                        BleAdvertiser.BRA_DISABLED_STREAMING_ACTIVE_ADV_INTERVAL);
-                }
+                else if (mBATService.getBATState() == BATService.STATE_PAUSED)
+                    setInitialState(mBRADisabledStreamingPaused);
+                else
+                    setInitialState(mBRADisabledStreamingDisabled);
             }
-            else if (mBATService.getBATState() == BATService.STATE_PAUSED)
-                setInitialState(mBRADisabledStreamingPaused);
             else
-                setInitialState(mBRADisabledStreamingDisabled);
+                Log.e(TAG, "BA Service is null");
 
         }
 
@@ -2075,4 +2079,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}