Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c02034a131082080f7dee50c040ee037f6350be2':
  Fix NPE in AR hardware binding sequence. b/22772433
This commit is contained in:
Anatol Pomazau
2015-08-28 15:36:30 +00:00
committed by Android Git Automerger
parent fec26a37a1 c02034a131
commit a3d10f015f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/location/ActivityRecognitionProxy.java
View File

@@ -123,6 +123,12 @@ public class ActivityRecognitionProxy {
Log.e(TAG, "No watcher found on connection."); Log.e(TAG, "No watcher found on connection.");
return; 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 { try {
watcher.onInstanceChanged(mInstance); watcher.onInstanceChanged(mInstance);
} catch (RemoteException e) { } catch (RemoteException e) {