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

Commit bf2ed3fc authored by Dianne Hackborn's avatar Dianne Hackborn Committed by The Android Automerger
Browse files

Fix issue #11790471: Crash removed home buttons and notification bar/shade 

Whoops persistent processes are, well, persistent.  Don't remove
services from them.  We'll be keeping that process record around.

Change-Id: I29e9fb6f704efdf0caad5e0307a7adbb416eed3b
parent c4294fbb

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

+5 −3
Original line number Diff line number Diff line
@@ -1847,7 +1847,7 @@ public final class ActiveServices { 
                }

            }

            if (finishing) {

                if (r.app != null) {

                if (r.app != null && !r.app.persistent) {

                    r.app.services.remove(r);

                }

                r.app = null;
@@ -1930,8 +1930,10 @@ public final class ActiveServices { 
                Slog.i(TAG, "  Force stopping service " + service);

                if (service.app != null) {

                    service.app.removed = true;

                    if (!service.app.persistent) {

                        service.app.services.remove(service);

                    }

                }

                service.app = null;

                service.isolatedProc = null;

                result.add(service);
@@ -2032,7 +2034,7 @@ public final class ActiveServices { 
            synchronized (sr.stats.getBatteryStats()) {

                sr.stats.stopLaunchedLocked();

            }

            if (sr.app != null) {

            if (sr.app != null && !sr.app.persistent) {

                sr.app.services.remove(sr);

            }

            sr.app = null;