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

Merge "Framework: Restrict warning message" am: 1c4a22fb08

Browse Source 
am: dce76b96f8

Change-Id: I6a2c63c617235ca78618384d53130265af4c9385
This commit is contained in:
android-build-prod (mdb)
2018-05-03 10:32:16 -07:00
committed by android-build-merger
parent 2a90d389a2 dce76b96f8
commit 7ab7657e92
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7854,8 +7854,13 @@ public class ActivityManagerService extends IActivityManager.Stub
try {
mInstaller.markBootComplete(VMRuntime.getInstructionSet(abi));
} catch (InstallerException e) {
Slog.w(TAG, "Unable to mark boot complete for abi: " + abi + " (" +
e.getMessage() +")");
if (!VMRuntime.didPruneDalvikCache()) {
// This is technically not the right filter, as different zygotes may
// have made different pruning decisions. But the log is best effort,
// anyways.
Slog.w(TAG, "Unable to mark boot complete for abi: " + abi + " (" +
e.getMessage() +")");
}
}
completedIsas.add(instructionSet);
}