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

Commit cef12198 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 58f1167e d6ac7628

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.