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

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

Merge "Merge "Protect against NPE while to updating service connection... 

Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198 am: 06fac4f7" into nyc-mr1-dev-plus-aosp
am: 6e5260f2

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

Change-Id: I26bacb23e569127aee3a3604029a5043033185d1
parents 46bbf358 6e5260f2

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

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

        // their client may have activities.

        if (r.app != null) {

            mService.mServices.updateServiceConnectionActivitiesLocked(r.app);

        }



        return true;

    }

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

+1 −1

File changed.

Contains only whitespace changes.