commit c772c1b3be80d8fd0ecf6f65631688c1e8f9d162
author Riddle Hsu <riddlehsu@google.com> Tue Jul 18 08:35:35 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 18 08:35:35 2023 +0000
tree 9f47c91e0fdf1d807b535bb08d0ddc9edf8fa02d
parent 20e993fe516c2af0d5793f43a7286894b43f8f7c
parent 1690f125ec94f12adf03f61854a193e97b0041ba

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

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

Change-Id: Icde9f353685830d6edf0cdec13aee4fcb56163e9
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 9ed8a04..473573a 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6375,6 +6375,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) {
@@ -6405,7 +6406,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);
         }
     }