From 8d9d12e898f8f50d2a9271cb582a75c4bb3c032e Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Mon, 20 Dec 2021 14:00:00 -0800 Subject: [PATCH] [am] use SYSTEM_UID when dumping incremental info during anr/crash Avoid callingUid checks for error message dumping. BUG: 211090221 Test: Run "atest com.android.cts.packagemanager.stats.host.IncrementalAppErrorStatsTests" and check logcat. Change-Id: I51b290bc9ecc9b983995b872dbeed251444ab569 --- .../java/com/android/server/am/ActivityManagerService.java | 2 +- .../java/com/android/server/am/ProcessErrorStateRecord.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 2593e512084da..f0f6bd172770e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8046,7 +8046,7 @@ public class ActivityManagerService extends IActivityManager.Stub // Obtain Incremental information if available if (r != null && r.info != null && r.info.packageName != null) { IncrementalStatesInfo incrementalStatesInfo = - mPackageManagerInt.getIncrementalStatesInfo(r.info.packageName, r.uid, + mPackageManagerInt.getIncrementalStatesInfo(r.info.packageName, SYSTEM_UID, r.userId); if (incrementalStatesInfo != null) { loadingProgress = incrementalStatesInfo.getProgress(); diff --git a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java index 18ad1f557ee6d..7fe270084e25d 100644 --- a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java +++ b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java @@ -16,6 +16,8 @@ package com.android.server.am; +import static android.os.Process.SYSTEM_UID; + import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ANR; import static com.android.server.am.ActivityManagerService.MY_PID; @@ -440,7 +442,7 @@ class ProcessErrorStateRecord { if (mApp.info != null && mApp.info.packageName != null && packageManagerInternal != null) { IncrementalStatesInfo incrementalStatesInfo = packageManagerInternal.getIncrementalStatesInfo( - mApp.info.packageName, mApp.uid, mApp.userId); + mApp.info.packageName, SYSTEM_UID, mApp.userId); if (incrementalStatesInfo != null) { loadingProgress = incrementalStatesInfo.getProgress(); }