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

Commit 062ab64f authored by Kevin Han's avatar Kevin Han
Browse files

Add last time unhibernated to dumped info 

Add the last time a package was unhibernated to app hibernation dump.
This can be used in bug reports or dumps to know that an app was
recently unhibernated.

Bug: 183142988
Test: adb shell dumpsys app_hibernation
Change-Id: I5bc1969d9385206b43e73b42d9d2067a66e9b609
parent aa029a25

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

+2 −0
Original line number Diff line number Diff line
@@ -362,6 +362,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);

    }
@@ -383,6 +384,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)

                + '}';

    }

}