Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7080658b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 48ef85a7 8d9d12e8

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

services/core/java/com/android/server/am/ProcessErrorStateRecord.java

+3 −1
Original line number Diff line number Diff line
@@ -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();

            }