From 32147f4c4e70da89f26855bc1baecb45f6a2154b Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Tue, 3 Sep 2019 13:17:22 -0700 Subject: Revert "Use mContext directly" This reverts commit dd3737611c640a764bcc55d8bcea1d13c7ea7989. Test: None, it's a revert Bug: 138952436 Change-Id: Ib809ba017e3563c09ea35b1a9056a6a95f4bdfc2 --- services/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 ee18b8974bac..7ea950aa8b1e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -5259,7 +5259,7 @@ public class ActivityManagerService extends IActivityManager.Stub storageManager.commitChanges(); } catch (Exception e) { PowerManager pm = (PowerManager) - mContext.getSystemService(Context.POWER_SERVICE); + mInjector.getContext().getSystemService(Context.POWER_SERVICE); pm.reboot("Checkpoint commit failed"); } -- cgit v1.2.3-59-g8ed1b