commit ad0eb9d1d6d6a43e08fccf33cdd2ccd1d6809244
author Michael Wright <michaelwr@google.com> Wed Jun 15 14:47:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 15 14:47:21 2016 +0000
tree 0af105d9a16355f7b17d54e098789e257c55a468
parent 6ed6dba025e91dbda670bc0283942e92400bd19f
parent e85da2bc2eeabb425c4b1270dbd0e22095aac957

Merge \"Make lid switch edge rather than level triggered.\" into nyc-dev
am: e85da2bc2e

Change-Id: Iba2a0acf6901f3b7b1d1d3bea6053ad6e2aea7db

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 827d51c..f9f0fd9 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -2271,7 +2271,6 @@
 
         readConfigurationDependentBehaviors();
         readLidState();
-        applyLidSwitchState();
 
         if (config.keyboard == Configuration.KEYBOARD_NOKEYS
                 || (keyboardPresence == PRESENCE_INTERNAL