Merge "Fix regression in virtual key haptics" into pi-dev

This commit is contained in:
Winson Chung
2018-06-01 00:40:46 +00:00
committed by Android (Google) Code Review

View File

@@ -549,7 +549,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
volatile boolean mGoingToSleep; volatile boolean mGoingToSleep;
volatile boolean mRequestedOrGoingToSleep; volatile boolean mRequestedOrGoingToSleep;
volatile boolean mRecentsVisible; volatile boolean mRecentsVisible;
volatile boolean mNavBarVirtualKeyHapticFeedbackEnabled; volatile boolean mNavBarVirtualKeyHapticFeedbackEnabled = true;
volatile boolean mPictureInPictureVisible; volatile boolean mPictureInPictureVisible;
// Written by vr manager thread, only read in this class. // Written by vr manager thread, only read in this class.
volatile private boolean mPersistentVrModeEnabled; volatile private boolean mPersistentVrModeEnabled;