commit c02034a131082080f7dee50c040ee037f6350be2
author Anatol Pomazau <anatol@google.com> Fri Aug 28 15:27:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 28 15:27:08 2015 +0000
tree a0d0d4b81f0cf022bac48714cc3b1b52e3bc0f4d
parent 7c388b0f73b1b2f881aa97458657a394e43e6727
parent 34c0882898c3e37ea1733e4614233c8a4cb71b67

am 34c08828: Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-dev

* commit '34c0882898c3e37ea1733e4614233c8a4cb71b67':
  Fix NPE in AR hardware binding sequence. b/22772433

services/core/java/com/android/server/location/ActivityRecognitionProxy.java

diff --git a/services/core/java/com/android/server/location/ActivityRecognitionProxy.java b/services/core/java/com/android/server/location/ActivityRecognitionProxy.java
index 2eb58bf..55222dc 100644
--- a/services/core/java/com/android/server/location/ActivityRecognitionProxy.java
+++ b/services/core/java/com/android/server/location/ActivityRecognitionProxy.java
@@ -123,6 +123,12 @@
                 Log.e(TAG, "No watcher found on connection.");
                 return;
             }
+            if (mInstance == null) {
+                // to keep backwards compatibility do not update the watcher when there is no
+                // instance available, or it will cause an NPE
+                Log.d(TAG, "AR HW instance not available, binding will be a no-op.");
+                return;
+            }
             try {
                 watcher.onInstanceChanged(mInstance);
             } catch (RemoteException e) {