Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 562284d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when unfolding a device." into tm-dev am: 3cc4eea5 am: dd37a5a3 

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



Change-Id: I7b6ccf66a45c1212c5c4a20e94375f9f7b4ee881
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6053c52 dd37a5a3

libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java

+12 −1
Original line number Diff line number Diff line
@@ -200,12 +200,23 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
                rotateRectToDisplayRotation(displayId, featureRect);

                transformToWindowSpaceRect(activity, featureRect);



                if (!isRectZero(featureRect)) {

                    // TODO(b/228641877) Remove guarding if when fixed.

                    features.add(new FoldingFeature(featureRect, baseFeature.getType(), state));

                }

            }

        }

        return features;

    }



    /**

     * Returns {@link true} if a {@link Rect} has zero width and zero height,

     * {@code false} otherwise.

     */

    private boolean isRectZero(Rect rect) {

        return rect.width() == 0 && rect.height() == 0;

    }



    private final class NotifyOnConfigurationChanged extends EmptyLifecycleCallbacksAdapter {

        @Override

        public void onActivityCreated(Activity activity, Bundle savedInstanceState) {