commit f9c9986c019e7e7a05fe304901a4dd7df3dc80f7
author Alex Chau <alexchau@google.com> Mon Nov 22 17:42:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 22 17:42:35 2021 +0000
tree 1642652af95f212891b40eb535c6b7711fbe7149
parent a0aa9ac6e4849b8dc02a7b39d19943f670775532
parent 04068586d426502245801cd38ea84083cab31493

Log the display state when number of screen bounds is inconsistent am: 4f49c9ce62 am: 04068586d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16230738

Change-Id: If21c6b2ebfef0dfd813689087cc65ed5ecb72f29

src/com/android/launcher3/util/DisplayController.java

diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 2068c29..c050c6c 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -261,6 +261,13 @@
             PortraitSize realSize = new PortraitSize(newInfo.currentSize.x, newInfo.currentSize.y);
             PortraitSize expectedSize = oldInfo.mInternalDisplays.get(
                     ApiWrapper.getUniqueId(display));
+            if (newInfo.supportedBounds.size() != oldInfo.supportedBounds.size()) {
+                Log.e("b/198965093",
+                        "Inconsistent number of displays"
+                                + "\ndisplay state: " + display.getState()
+                                + "\noldInfo.supportedBounds: " + oldInfo.supportedBounds
+                                + "\nnewInfo.supportedBounds: " + newInfo.supportedBounds);
+            }
             if (!realSize.equals(expectedSize) && display.getState() == Display.STATE_OFF) {
                 Log.e("b/198965093", "Display size changed while display is off, ignoring change");
                 return;