From c5fc5fe3266a7b01f689e2c981babadca5360836 Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Tue, 12 Nov 2019 15:33:22 -0800 Subject: [PATCH] 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 --- .../core/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 54192a9459c80..e8505fcb37a4b 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 @@ public class ActivityManagerService extends IActivityManager.Stub storageManager.commitChanges(); } catch (Exception e) { PowerManager pm = (PowerManager) - mInjector.getContext().getSystemService(Context.POWER_SERVICE); + mContext.getSystemService(Context.POWER_SERVICE); pm.reboot("Checkpoint commit failed"); }