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

Commit e3190c20 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Protect against NPE while to updating service connection activities." into nyc-dev 

am: cef12198

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

Change-Id: I3a430751bf02631bee57355c901d3f78248a3261
parents 197f9e1c cef12198

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }

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

+1 −1

File changed.

Contains only whitespace changes.