From a650dd8ce99f42367371e4e2cabb2cd60e5db6ea Mon Sep 17 00:00:00 2001 From: hmz007 Date: Sat, 15 Oct 2022 19:16:00 +0800 Subject: [PATCH] frameworks: sort extcon files to fixes hdmi audio output Signed-off-by: hmz007 --- .../core/java/com/android/server/ExtconUEventObserver.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworks/base/services/core/java/com/android/server/ExtconUEventObserver.java b/frameworks/base/services/core/java/com/android/server/ExtconUEventObserver.java index 6a478006595..7a869276576 100644 --- a/frameworks/base/services/core/java/com/android/server/ExtconUEventObserver.java +++ b/frameworks/base/services/core/java/com/android/server/ExtconUEventObserver.java @@ -24,6 +24,7 @@ import android.util.Slog; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.Map; @@ -98,6 +99,7 @@ public abstract class ExtconUEventObserver extends UEventObserver { Pattern p = regex == null ? null : Pattern.compile(regex); File file = new File("/sys/class/extcon"); File[] files = file.listFiles(); + Arrays.sort(files); if (files == null) { Slog.wtf(TAG, file + " exists " + file.exists() + " isDir " + file.isDirectory() + " but listFiles returns null. "