commit d6ac76284d0a5a74988931d9a8d8c3785b5aa62a
author Wale Ogunwale <ogunwale@google.com> Thu May 26 09:02:25 2016 -0700
committer Wale Ogunwale <ogunwale@google.com> Thu May 26 12:07:21 2016 -0700
tree bad366c867e861cfc5b691e5826f888183a72c4d
parent f7375b46ff9848feba0a9632669d07384954d69e

Protect against NPE while to updating service connection activities.

Bug: 28972558
Change-Id: I83f6e33248bb5b5c6ed34a3590d594bf82463a96

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 01b2eb4..197d9ec 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1338,7 +1338,9 @@
 
         // 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;
     }