Fix NPE when performing BLE scans.

Bug: 27811549
Change-Id: I017b34745682dd9db5487921df5c01dfde93d67c

diff --git a/src/com/android/bluetooth/gatt/ContextMap.java b/src/com/android/bluetooth/gatt/ContextMap.java
index 6f9025d..8cc65d9 100644 (file)
--- a/src/com/android/bluetooth/gatt/ContextMap.java
+++ b/src/com/android/bluetooth/gatt/ContextMap.java
@@ -154,11 +154,11 @@ import com.android.bluetooth.btservice.BluetoothProto;
         }
         synchronized (mApps) {
             AppScanStats appScanStats = mAppScanStats.get(appName);
-            mApps.add(new App(uuid, callback, appName, appScanStats));
             if (appScanStats == null) {
                 appScanStats = new AppScanStats(appName, this, service);
                 mAppScanStats.put(appName, appScanStats);
             }
+            mApps.add(new App(uuid, callback, appName, appScanStats));
             appScanStats.isRegistered = true;
         }
     }