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 
am: 6e5260f24f

* commit '6e5260f24f10b9379cd69c6cda52e086bd9f45a0':
  Protect against NPE while to updating service connection activities.

Change-Id: I26bacb23e569127aee3a3604029a5043033185d1
This commit is contained in:
Wale Ogunwale
2016-05-27 22:13:49 +00:00
committed by android-build-merger
parent 46bbf358c1 6e5260f24f
commit 4db4c252f1
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/ActiveServices.java
View File

@@ -753,7 +753,7 @@ public final class ActiveServices {
public void updateServiceConnectionActivitiesLocked(ProcessRecord clientProc) {
ArraySet<ProcessRecord> updatedProcesses = null;
for (int i=0; i<clientProc.connections.size(); i++) {
for (int i = 0; i < clientProc.connections.size(); i++) {
final ConnectionRecord conn = clientProc.connections.valueAt(i);
final ProcessRecord proc = conn.binding.service.app;
if (proc == null || proc == clientProc) {

4
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
// their client may have activities.
mService.mServices.updateServiceConnectionActivitiesLocked(r.app);
if (r.app != null) {
mService.mServices.updateServiceConnectionActivitiesLocked(r.app);
}
return true;
}