From 8c7f0100c7808a94adffe404365711c950a24ab8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Mon, 26 Aug 2019 19:29:45 -0700 Subject: [PATCH] Use mContext directly, and enforce via logging We already have the context saved, so we can just use that. Add a log statement so we can test for the existence of this patch from a CTS test. Test: Edited code to force expection path to be called, confirmed reboot happens Bug: 138952436 Bug: 140111727 Change-Id: Iaceec82d4716837158d1233400b4a44cbf67a5e8 --- services/core/java/com/android/server/am/ActivityManagerService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ee18b8974bac..9b05fb333acf 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5255,6 +5255,9 @@ public class ActivityManagerService extends IActivityManager.Stub // Inform checkpointing systems of success try { + // This line is needed to CTS test for the correct exception handling + // See b/138952436#comment36 for context + Slog.i(TAG, "About to commit checkpoint"); IStorageManager storageManager = PackageHelper.getStorageManager(); storageManager.commitChanges(); } catch (Exception e) { -- 2.11.0