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

Commit 254798f2 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Add a new process state for "service restarting"."

parents 449ff243 8eea0fcd
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -515,7 +515,8 @@ final class ProcessRecord {
     */
    public void resetPackageList(ProcessTracker tracker) {
        long now = SystemClock.uptimeMillis();
        baseProcessTracker.setState(ProcessTracker.STATE_NOTHING, 0, now, pkgList);
        baseProcessTracker.setState(ProcessTracker.STATE_NOTHING,
                tracker.getMemFactorLocked(), now, pkgList);
        if (pkgList.size() != 1) {
            pkgList.clear();
            pkgList.put(info.packageName, tracker.getProcessStateLocked(
+281 −90

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ final class ServiceRecord extends Binder {
        }
        if ((serviceInfo.applicationInfo.flags&ApplicationInfo.FLAG_PERSISTENT) == 0) {
            tracker = ams.mProcessTracker.getServiceStateLocked(serviceInfo.packageName,
                    serviceInfo.applicationInfo.uid, serviceInfo.name);
                    serviceInfo.applicationInfo.uid, serviceInfo.processName, serviceInfo.name);
        }
        return tracker;
    }