Merge "Framework: Restrict warning message"

am: 1c4a22fb08

Change-Id: I6236d8f5a4433fa73c931679fdd2c071b726b0f1
This commit is contained in:
android-build-prod (mdb)
2018-05-03 10:25:12 -07:00
committed by android-build-merger

View File

@@ -7305,8 +7305,13 @@ public class ActivityManagerService extends IActivityManager.Stub
try { try {
mInstaller.markBootComplete(VMRuntime.getInstructionSet(abi)); mInstaller.markBootComplete(VMRuntime.getInstructionSet(abi));
} catch (InstallerException e) { } catch (InstallerException e) {
Slog.w(TAG, "Unable to mark boot complete for abi: " + abi + " (" + if (!VMRuntime.didPruneDalvikCache()) {
e.getMessage() +")"); // 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); completedIsas.add(instructionSet);
} }