Merge "[ActivityManager] Fix ServiceRecord leakage"

            }

        }

        // 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);

        }

        updateServiceConnectionActivitiesLocked(app);

        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()) {

            }

        }

        // 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);

        }

        updateServiceConnectionActivitiesLocked(app);

        app.connections.clear();

        ServiceMap smap = getServiceMap(app.userId);

        // Now do remaining service cleanup.