summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Beverly <beverlyt@google.com> 2022-03-14 15:46:22 +0000
committer Beverly <beverlyt@google.com> 2022-03-14 15:46:22 +0000
commit0872bcc7030a3d114f2d4109b0a3164d60770cde (patch)
tree7881a167f1d5d527b2ce2b0eb9734f796a44fbde
parentb78bf4e4d7b9d19c8872c76e95a001adcecc315d (diff)
Use/update cached battery manager
else, it can be null and cause an NPE Test: manual Fixes: 16785343 Change-Id: Id0e0edceba4244558caac81e31d715a45c50d4fa
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index e79148d52715..dc5b325022a6 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -792,7 +792,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
public void onWakeUp() {
synchronized (mLock) {
if (shouldEnableWakeGestureLp()
- && mBatteryManagerInternal.getPlugType() != BATTERY_PLUGGED_WIRELESS) {
+ && getBatteryManagerInternal().getPlugType() != BATTERY_PLUGGED_WIRELESS) {
performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, false,
"Wake Up");
wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromWakeGesture,