summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2018-05-31 20:23:26 -0700
committer android-build-merger <android-build-merger@google.com> 2018-05-31 20:23:26 -0700
commit29218b8fc733db5e046e8efbfacf1e0a4969ae48 (patch)
tree4683ab9e18066cefcbc847da1ab61003b7e63dc0
parenta0a864e571250097476181cb6d9c7b0f1268b197 (diff)
parentc197176cd2dfa3da0760f1d2dc73b5b86dda2e2d (diff)
Merge "Fix regression in virtual key haptics" into pi-dev
am: c197176cd2 Change-Id: Ifef4e6978d0731b6270eb0fc0b1fe23fe27d1d3b
-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 15d0eabcdcc4..4be2dba47442 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -549,7 +549,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
volatile boolean mGoingToSleep;
volatile boolean mRequestedOrGoingToSleep;
volatile boolean mRecentsVisible;
- volatile boolean mNavBarVirtualKeyHapticFeedbackEnabled;
+ volatile boolean mNavBarVirtualKeyHapticFeedbackEnabled = true;
volatile boolean mPictureInPictureVisible;
// Written by vr manager thread, only read in this class.
volatile private boolean mPersistentVrModeEnabled;