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

Commit 1fd9d0e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Log GlobalHibernatedApps atom" into sc-dev am: 690dd68d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14431326

Change-Id: I63be48fb5aaeb95832dac9d30e96ef8a5243293c
parents 2cf4609a 690dd68d

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

+44 −21
Original line number Diff line number Diff line
@@ -182,12 +182,18 @@ public final class AppHibernationService extends SystemService { 
                    NAMESPACE_APP_HIBERNATION,

                    ActivityThread.currentApplication().getMainExecutor(),

                    this::onDeviceConfigChanged);

            getContext().getSystemService(StatsManager.class)

                    .setPullAtomCallback(

            final StatsManager statsManager = getContext().getSystemService(StatsManager.class);

            final StatsPullAtomCallbackImpl pullAtomCallback = new StatsPullAtomCallbackImpl();

            statsManager.setPullAtomCallback(

                    FrameworkStatsLog.USER_LEVEL_HIBERNATED_APPS,

                    /* metadata */ null, // use default PullAtomMetadata values

                    mBackgroundExecutor,

                            new StatsPullAtomCallbackImpl());

                    pullAtomCallback);

            statsManager.setPullAtomCallback(

                    FrameworkStatsLog.GLOBAL_HIBERNATED_APPS,

                    /* metadata */ null, // use default PullAtomMetadata values

                    mBackgroundExecutor,

                    pullAtomCallback);

        }

    }
@@ -291,6 +297,7 @@ public final class AppHibernationService extends SystemService { 
                        stateSnapshot.packageName,

                        userIdSnapshot,

                        stateSnapshot.hibernated,

                        // TODO(b/187224817): This isn't the expected value right now.

                        stateSnapshot.lastUnhibernatedMs);

            });

            List<UserLevelState> states = new ArrayList<>(mUserStates.get(userId).values());
@@ -938,10 +945,14 @@ public final class AppHibernationService extends SystemService { 
    private final class StatsPullAtomCallbackImpl implements StatsPullAtomCallback {

        @Override

        public int onPullAtom(int atomTag, @NonNull List<StatsEvent> data) {

            if (atomTag != FrameworkStatsLog.USER_LEVEL_HIBERNATED_APPS) {

                return StatsManager.PULL_SKIP;

            if (!isAppHibernationEnabled()

                    && (atomTag == FrameworkStatsLog.USER_LEVEL_HIBERNATED_APPS

                    || atomTag == FrameworkStatsLog.GLOBAL_HIBERNATED_APPS)) {

                return StatsManager.PULL_SUCCESS;

            }

            if (isAppHibernationEnabled()) {



            switch (atomTag) {

                case FrameworkStatsLog.USER_LEVEL_HIBERNATED_APPS:

                    List<UserInfo> userInfos = mUserManager.getAliveUsers();

                    final int numUsers = userInfos.size();

                    for (int i = 0; i < numUsers; ++i) {
@@ -955,6 +966,18 @@ public final class AppHibernationService extends SystemService { 
                            );

                        }

                    }

                    break;

                case FrameworkStatsLog.GLOBAL_HIBERNATED_APPS:

                    int hibernatedAppCount = 0;

                    synchronized (mLock) {

                        for (GlobalLevelState state : mGlobalHibernationStates.values()) {

                            if (state.hibernated) hibernatedAppCount++;

                        }

                    }

                    data.add(FrameworkStatsLog.buildStatsEvent(atomTag, hibernatedAppCount));

                    break;

                default:

                    return StatsManager.PULL_SKIP;

            }

            return StatsManager.PULL_SUCCESS;

        }