commit 818d8813f7bbab13ebccf5ab291fe3de8df5157e
author Daniel Rosenberg <drosen@google.com> Tue Nov 12 15:33:22 2019 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Sat Nov 16 00:27:33 2019 +0000
tree 83f4c72f75ee249187524cd8ddfdd178752abb87
parent 859ead528cd09f6fdf3a85df390745054058d12c

Actually use mContext directly

I40e95d72c63f864131f0028c47f121463d0f6dff (Use mContext directly)
lost a needed line in a rebase

Test: Forced commit to return exception, checked that device reboots
Bug: 138952436
Merged-In: Idb7cb9a5b7c4c0d237ece9716932a260956a0109
Change-Id: I8e7484631cd76965e660544a1af9f567dc5d3a34
(cherry picked from commit c5fc5fe3266a7b01f689e2c981babadca5360836)

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 078fcef..c2482ef 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5262,7 +5262,7 @@
             storageManager.commitChanges();
         } catch (Exception e) {
             PowerManager pm = (PowerManager)
-                     mInjector.getContext().getSystemService(Context.POWER_SERVICE);
+                     mContext.getSystemService(Context.POWER_SERVICE);
             pm.reboot("Checkpoint commit failed");
         }