diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-28 02:04:19 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-28 02:04:19 +0000 |
| commit | 5fd590d32d91ac237513a502f55fdae926edea14 (patch) | |
| tree | 9cf7a399fc083bf01a2d1ad72693e3781283a70d | |
| parent | 955644cc93f4ec42c8a58e8f32c0d61a176586a7 (diff) | |
| parent | 081360747b3192aedab6156b8bf6f98a106ae05c (diff) | |
| download | base-5fd590d32d91ac237513a502f55fdae926edea14.tar.gz | |
Merge cherrypicks of [9289279] into qt-release
Change-Id: I7dc3ba4f3d16d8c4067c708734cfc610e63c129b
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
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 91ae156afdf5..88c29987d1df 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) - mInjector.getContext().getSystemService(Context.POWER_SERVICE); + mContext.getSystemService(Context.POWER_SERVICE); pm.reboot("Checkpoint commit failed"); } |