summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Rosenberg <drosen@google.com> 2019-11-13 13:31:00 -0800
committer android-build-merger <android-build-merger@google.com> 2019-11-13 13:31:00 -0800
commit727d98dd4527ece566447362ea75d79e51880a7c (patch)
tree368600cb3245c8732e54c51e5fb142e782ded819
parent4246db32819fd3be44e114c920431780c542712b (diff)
parentabd0f5ba3d3df2e572bab0da773e3af7a67ccb87 (diff)
Merge "Actually use mContext directly" into qt-qpr1-dev
am: abd0f5ba3d Change-Id: I42519afde4d3a15a0128a3cd32ff2cd410901a5d
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 552491ddd93d..0949106dab33 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5283,7 +5283,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");
}