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

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

1 files changed, 6 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/location/ActivityRecognitionProxy.java b/services/core/java/com/android/server/location/ActivityRecognitionProxy.java
index 2eb58bfd2638..55222dc305c3 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 @@ public class ActivityRecognitionProxy {
                 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) {