From 7ba631f8b7ba823e943bdda623f7262b342e2c60 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 4 May 2011 15:28:00 -0700 Subject: [PATCH] If there is no hdmi available, still record that hdmi is not plugged in. Bug: 4321927 Change-Id: I583b75477914f6ec0d6cb8c3d6775063202e1dbe --- .../internal/policy/impl/PhoneWindowManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 8a29419e4c743..6632f3411540e 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2217,11 +2217,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { } void initializeHdmiState() { + boolean plugged = false; // watch for HDMI plug messages if the hdmi switch exists if (new File("/sys/devices/virtual/switch/hdmi/state").exists()) { mHDMIObserver.startObserving("DEVPATH=/devices/virtual/switch/hdmi"); - boolean plugged = false; final String filename = "/sys/class/switch/hdmi/state"; FileReader reader = null; try { @@ -2243,11 +2243,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } } - - // This dance forces the code in setHdmiPlugged to run. - mHdmiPlugged = !plugged; - setHdmiPlugged(!mHdmiPlugged); } + // This dance forces the code in setHdmiPlugged to run. + // Always do this so the sticky intent is stuck (to false) if there is no hdmi. + mHdmiPlugged = !plugged; + setHdmiPlugged(!mHdmiPlugged); } /**