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

Commit a800579b authored by Kevin Han's avatar Kevin Han Committed by Android (Google) Code Review
Browse files

Merge "Add last time unhibernated to dumped info" into sc-dev

parents 5e56a422 062ab64f

services/core/java/com/android/server/apphibernation/AppHibernationService.java

+2 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ public final class AppHibernationService extends SystemService { 
            UserLevelState pkgState) {

        Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "unhibernatePackage");

        pkgState.hibernated = false;

        pkgState.lastUnhibernatedMs = System.currentTimeMillis();

        Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

    }
@@ -387,6 +388,7 @@ public final class AppHibernationService extends SystemService { 
    private void unhibernatePackageGlobally(@NonNull String packageName, GlobalLevelState state) {

        Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "unhibernatePackageGlobally");

        state.hibernated = false;

        state.lastUnhibernatedMs = System.currentTimeMillis();

        Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

    }

services/core/java/com/android/server/apphibernation/GlobalLevelState.java

+11 −1
Original line number Diff line number Diff line
@@ -16,18 +16,28 @@ 


package com.android.server.apphibernation;



import android.annotation.CurrentTimeMillisLong;



import java.text.SimpleDateFormat;



/**

 * Data class that contains global hibernation state for a package.

 */

final class GlobalLevelState {

    // Only show day for privacy purposes.

    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");



    public String packageName;

    public boolean hibernated;

    @CurrentTimeMillisLong

    public long lastUnhibernatedMs;



    @Override

    public String toString() {

        return "GlobalLevelState{"

                + "packageName='" + packageName + '\''

                + ", hibernated=" + hibernated

                + ", hibernated=" + hibernated + '\''

                + ", lastUnhibernated=" + DATE_FORMAT.format(lastUnhibernatedMs)

                + '}';

    }

}

services/core/java/com/android/server/apphibernation/UserLevelState.java

+10 −1
Original line number Diff line number Diff line
@@ -16,18 +16,27 @@ 


package com.android.server.apphibernation;



import android.annotation.CurrentTimeMillisLong;



import java.text.SimpleDateFormat;



/**

 * Data class that contains hibernation state info of a package for a user.

 */

final class UserLevelState {

    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");



    public String packageName;

    public boolean hibernated;

    @CurrentTimeMillisLong

    public long lastUnhibernatedMs;



    @Override

    public String toString() {

        return "UserLevelState{"

                + "packageName='" + packageName + '\''

                + ", hibernated=" + hibernated

                + ", hibernated=" + hibernated + '\''

                + ", lastUnhibernated=" + DATE_FORMAT.format(lastUnhibernatedMs)

                + '}';

    }

}