summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java10
1 files 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 8a29419e4c74..6632f3411540 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);
}
/**