diff options
| -rw-r--r-- | services/core/java/com/android/server/location/ActivityRecognitionProxy.java | 6 |
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) { |