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

Commit 38036ed5 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "Tidy up all service state when done executing" into qt-dev 

am: 5063579f

Change-Id: I0c9e8d7f4abae45039218a9efbd341d954fa55c2
parents e6bd942a 5063579f

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

+5 −2
Original line number Diff line number Diff line
@@ -3250,6 +3250,7 @@ public final class ActiveServices { 
            int memFactor = mAm.mProcessStats.getMemFactorLocked();

            long now = SystemClock.uptimeMillis();

            r.tracker.setExecuting(false, memFactor, now);

            r.tracker.setForeground(false, memFactor, now);

            r.tracker.setBound(false, memFactor, now);

            r.tracker.setStarted(false, memFactor, now);

        }
@@ -3293,8 +3294,10 @@ public final class ActiveServices { 
            }

            r.executeFg = false;

            if (r.tracker != null) {

                r.tracker.setExecuting(false, mAm.mProcessStats.getMemFactorLocked(),

                        SystemClock.uptimeMillis());

                final int memFactor = mAm.mProcessStats.getMemFactorLocked();

                final long now = SystemClock.uptimeMillis();

                r.tracker.setExecuting(false, memFactor, now);

                r.tracker.setForeground(false, memFactor, now);

                if (finishing) {

                    r.tracker.clearCurrentOwner(r, false);

                    r.tracker = null;