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

Add multiuser support to StatsPullAtomService

Browse Source 
Including incremental packages from all users instead on only system
user in pullInstalledIncrementalPackagesLocked.

Bug: 197784344
Test: install incremental package as secondary user
Test: statsd_testdrive 10114
Change-Id: I5435c1bb74266a8881cc95140f3ed15461377368
This commit is contained in:
William Loh
2022-05-06 20:28:02 +00:00
parent 430761bb29
commit f587ce8d05
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
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.health.HealthServiceWrapper;
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.ProcfsMemoryUtil.MemorySnapshot;
import com.android.server.stats.pull.netstats.NetworkStatsExt;
@@ -4106,11 +4107,24 @@ public class StatsPullAtomService extends SystemService {
// Incremental is not enabled on this device. The result list will be empty.
return StatsManager.PULL_SUCCESS;
}
List<PackageInfo> installedPackages = pm.getInstalledPackages(0);
for (PackageInfo pi : installedPackages) {
if (IncrementalManager.isIncrementalPath(pi.applicationInfo.getBaseCodePath())) {
pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, pi.applicationInfo.uid));
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) {
if (IncrementalManager.isIncrementalPath(
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;
}