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

Commit 604ce496 authored by louis_chang's avatar louis_chang Committed by Steve Kondik
Browse files

[ActivityManager] Fix ServiceRecord leakage 

Symptom:
The first step of cleaning up application services is
to clear the app state from services (which set sr.app
to null). Then it clean up the service connections.
In some scenario, the Service might be removed during
the connection cleanup (i.e. the Service is no longer
needed). In that case, the Service will be removed from
ServiceMap, but won't be removed from r.app.services
(line 1612) because the r.app is null.

Solution:
Remove the service connection first.

Change-Id: I644d73af58fe0e7c1c4a6c9779fe6b5d747b880d
parent b89dd5ac

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

+8 −8
Original line number Diff line number Diff line
@@ -2036,7 +2036,14 @@ public final class ActiveServices { 
            }

        }



        // First clear app state from services.

        // Clean up any connections this application has to other services.

        for (int i=app.connections.size()-1; i>=0; i--) {

            ConnectionRecord r = app.connections.valueAt(i);

            removeConnectionLocked(r, app, null);

        }

        app.connections.clear();



        // Clear app state from services.

        for (int i=app.services.size()-1; i>=0; i--) {

            ServiceRecord sr = app.services.valueAt(i);

            synchronized (sr.stats.getBatteryStats()) {
@@ -2063,13 +2070,6 @@ public final class ActiveServices { 
            }

        }



        // Clean up any connections this application has to other services.

        for (int i=app.connections.size()-1; i>=0; i--) {

            ConnectionRecord r = app.connections.valueAt(i);

            removeConnectionLocked(r, app, null);

        }

        app.connections.clear();



        ServiceMap smap = getServiceMap(app.userId);



        // Now do remaining service cleanup.