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

Merge "Add multiuser support to StatsPullAtomService" into tm-dev

Browse Source
This commit is contained in:
William Loh
2022-05-10 17:27:13 +00:00
committed by Android (Google) Code Review
parent 6e08678675 f587ce8d05
commit f29ffc2940
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -204,6 +204,7 @@ import com.android.server.SystemServiceManager;
import com.android.server.am.MemoryStatUtil.MemoryStat; import com.android.server.am.MemoryStatUtil.MemoryStat;
import com.android.server.health.HealthServiceWrapper; import com.android.server.health.HealthServiceWrapper;
import com.android.server.notification.NotificationManagerService; import com.android.server.notification.NotificationManagerService;
import com.android.server.pm.UserManagerInternal;
import com.android.server.stats.pull.IonMemoryUtil.IonAllocations; import com.android.server.stats.pull.IonMemoryUtil.IonAllocations;
import com.android.server.stats.pull.ProcfsMemoryUtil.MemorySnapshot; import com.android.server.stats.pull.ProcfsMemoryUtil.MemorySnapshot;
import com.android.server.stats.pull.netstats.NetworkStatsExt; import com.android.server.stats.pull.netstats.NetworkStatsExt;
@@ -4106,12 +4107,25 @@ public class StatsPullAtomService extends SystemService {
// Incremental is not enabled on this device. The result list will be empty. // Incremental is not enabled on this device. The result list will be empty.
return StatsManager.PULL_SUCCESS; return StatsManager.PULL_SUCCESS;
} }
List<PackageInfo> installedPackages = pm.getInstalledPackages(0); final long token = Binder.clearCallingIdentity();
try {
int[] userIds = LocalServices.getService(UserManagerInternal.class).getUserIds();
for (int userId : userIds) {
List<PackageInfo> installedPackages = pm.getInstalledPackagesAsUser(0, userId);
for (PackageInfo pi : installedPackages) { for (PackageInfo pi : installedPackages) {
if (IncrementalManager.isIncrementalPath(pi.applicationInfo.getBaseCodePath())) { if (IncrementalManager.isIncrementalPath(
pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, pi.applicationInfo.uid)); pi.applicationInfo.getBaseCodePath())) {
pulledData.add(
FrameworkStatsLog.buildStatsEvent(atomTag, pi.applicationInfo.uid));
} }
} }
}
} catch (Exception e) {
Slog.e(TAG, "failed to pullInstalledIncrementalPackagesLocked", e);
return StatsManager.PULL_SKIP;
} finally {
Binder.restoreCallingIdentity(token);
}
return StatsManager.PULL_SUCCESS; return StatsManager.PULL_SUCCESS;
} }