Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I63be48fb5aaeb95832dac9d30e96ef8a5243293c
This commit is contained in:
TreeHugger Robot
2021-05-06 08:25:17 +00:00
committed by Automerger Merge Worker
parent 2cf4609aed 690dd68dcc
commit 1fd9d0e2cf
1 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
services/core/java/com/android/server/apphibernation/AppHibernationService.java
View File

@@ -182,12 +182,18 @@ public final class AppHibernationService extends SystemService {
NAMESPACE_APP_HIBERNATION,
ActivityThread.currentApplication().getMainExecutor(),
this::onDeviceConfigChanged);
getContext().getSystemService(StatsManager.class)
.setPullAtomCallback(
FrameworkStatsLog.USER_LEVEL_HIBERNATED_APPS,
/* metadata */ null, // use default PullAtomMetadata values
mBackgroundExecutor,
new StatsPullAtomCallbackImpl());
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,
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,23 +945,39 @@ 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()) {
List<UserInfo> userInfos = mUserManager.getAliveUsers();
final int numUsers = userInfos.size();
for (int i = 0; i < numUsers; ++i) {
final int userId = userInfos.get(i).id;
if (mUserManager.isUserUnlockingOrUnlocked(userId)) {
data.add(
FrameworkStatsLog.buildStatsEvent(
atomTag,
getHibernatingPackagesForUser(userId).size(),
userId)
);
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) {
final int userId = userInfos.get(i).id;
if (mUserManager.isUserUnlockingOrUnlocked(userId)) {
data.add(
FrameworkStatsLog.buildStatsEvent(
atomTag,
getHibernatingPackagesForUser(userId).size(),
userId)
);
}
}
}
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;
}