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

Merge "[am] use SYSTEM_UID when dumping incremental info during anr/crash"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-21 00:55:54 +00:00
committed by Android (Google) Code Review
parent 48ef85a789 8d9d12e898
commit 7080658ba8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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();

4
services/core/java/com/android/server/am/ProcessErrorStateRecord.java
View File

@@ -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();
}