commit 6ec8c913272a7e9e95fac931e4bc4bbe05fbe99b
author Riddle Hsu <riddlehsu@google.com> Tue Jul 18 10:03:40 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 18 10:03:40 2023 +0000
tree 6a8c9ee9e0949ef9df565898c1ab386376fa3811
parent dea2a7e9e93500ad5dbff0b11531487df7254b5c
parent 1a15bf65edd2358db7bfc8b5fff1c92a6434c4b9

Merge "HdmiVideoExtconUEventObserver: handle "DP=1" state" into main am: f761d414df am: 1690f125ec am: c772c1b3be am: 1a15bf65ed

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2630590

Change-Id: Iba1ae100ed7184b39d3c492706b6d7648b702f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 a5a6615..bb030e6 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6458,6 +6458,7 @@
 
     private class HdmiVideoExtconUEventObserver extends ExtconStateObserver<Boolean> {
         private static final String HDMI_EXIST = "HDMI=1";
+        private static final String DP_EXIST = "DP=1";
         private static final String NAME = "hdmi";
 
         private boolean init(ExtconInfo hdmi) {
@@ -6488,7 +6489,8 @@
         public Boolean parseState(ExtconInfo extconIfno, String state) {
             // extcon event state changes from kernel4.9
             // new state will be like STATE=HDMI=1
-            return state.contains(HDMI_EXIST);
+            // or like STATE=DP=1 for newer kernel
+            return state.contains(HDMI_EXIST) || state.contains(DP_EXIST);
         }
     }