Merge "Fix crash in LocalDisplayAdapter"

2020-10-13 15:56:43 +00:00
parent 11980431e0 da438a1da4
commit d1fec2c75e
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -969,6 +969,10 @@ final class LocalDisplayAdapter extends DisplayAdapter {
        }

        private int findMatchingModeIdLocked(int configId) {
+            if (configId < 0 || configId >= mDisplayConfigs.length) {
+                Slog.e(TAG, "Invalid display config index " + configId);
+                return NO_DISPLAY_MODE_ID;
+            }
            SurfaceControl.DisplayConfig config = mDisplayConfigs[configId];
            for (int i = 0; i < mSupportedModes.size(); i++) {
                DisplayModeRecord record = mSupportedModes.valueAt(i);