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

Merge "Fix test failure in FrameworksServicesTests"

Browse Source
This commit is contained in:
Jing Ji
2021-08-25 18:17:59 +00:00
committed by Android (Google) Code Review
parent 1fc2ce15ed 593fb6b8f9
commit e45d6f3d23
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,8 @@ class ProcessErrorStateRecord {
EventLog.writeEvent(EventLogTags.AM_ANR, mApp.userId, pid, mApp.processName,
mApp.info.flags, annotation);
if (mService.mTraceErrorLogger.isAddErrorIdEnabled()) {
if (mService.mTraceErrorLogger != null
&& mService.mTraceErrorLogger.isAddErrorIdEnabled()) {
errorId = mService.mTraceErrorLogger.generateErrorId();
mService.mTraceErrorLogger.addErrorIdToTrace(mApp.processName, errorId);
} else {
@@ -427,7 +428,7 @@ class ProcessErrorStateRecord {
float loadingProgress = 1;
IncrementalMetrics incrementalMetrics = null;
final PackageManagerInternal packageManagerInternal = mService.getPackageManagerInternal();
if (mApp.info != null && mApp.info.packageName != null) {
if (mApp.info != null && mApp.info.packageName != null && packageManagerInternal != null) {
IncrementalStatesInfo incrementalStatesInfo =
packageManagerInternal.getIncrementalStatesInfo(
mApp.info.packageName, mApp.uid, mApp.userId);

3
services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
View File

@@ -470,6 +470,8 @@ public class ActivityManagerTest {
sendCommand(COMMAND_UNBIND_SERVICE, TEST_APP2, TEST_APP1, null);
runShellCommand("cmd deviceidle whitelist -" + TEST_APP1);
runShellCommand("cmd deviceidle whitelist -" + TEST_APP2);
am.forceStopPackage(TEST_APP1);
am.forceStopPackage(TEST_APP2);
}
}
@@ -700,6 +702,7 @@ public class ActivityManagerTest {
am.removeOnUidImportanceListener(uidListener1);
am.removeOnUidImportanceListener(uidListener2);
am.removeOnUidImportanceListener(uidListener3);
am.forceStopPackage(TEST_APP1);
}
}