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

Commit 4c2dd01f 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."... 

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

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

Change-Id: Iba9df7ad6a8bcb1448209b5c481811f2c5544fc6
parents 14b29dfe e3190c20

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.