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

Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7 am: 06fac4f77b" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-05-27 03:54:58 +00:00
committed by Android (Google) Code Review
parent 61903f9151 e7d5974077
commit 6e5260f24f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1338,7 +1338,9 @@ public final class ActivityStackSupervisor implements DisplayListener {
// Update any services we are bound to that might care about whether // Update any services we are bound to that might care about whether
// their client may have activities. // their client may have activities.
if (r.app != null) {
mService.mServices.updateServiceConnectionActivitiesLocked(r.app); mService.mServices.updateServiceConnectionActivitiesLocked(r.app);
}
return true; return true;
} }