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

Commit 6e5260f2 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents 61903f91 e7d59740

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.