Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c08828 authored by Anatol Pomazau's avatar Anatol Pomazau Committed by Android (Google) Code Review
Browse files

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

parents ffa3d040 a1c8a6b0

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

+6 −0
Original line number Diff line number Diff line
@@ -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) {