commit afb2c9e9cc585e80b751117c5eafa29d07d6e48d
author Paul Lawrence <paullawrence@google.com> Fri Nov 22 17:19:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 22 17:19:38 2019 +0000
tree e2749a47875f2722dca81327eb0cf9f8beb7ba65
parent 49af39e751a777f5bb05b4c9e5491e8762f2fc9a
parent e7b214ce34aa6e65e36055069bb4044bd635ef24

Merge "Use mContext directly, and enforce via logging"

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 5af1480..d07ec48 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5276,11 +5276,14 @@
 
         // 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) {
             PowerManager pm = (PowerManager)
-                     mInjector.getContext().getSystemService(Context.POWER_SERVICE);
+                     mContext.getSystemService(Context.POWER_SERVICE);
             pm.reboot("Checkpoint commit failed");
         }