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

Commit bde42f87 authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in ActivityRecord.inSizeCompatMode()" into sc-dev am: a8d563cf

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

Change-Id: I4f0a6f1060b309b33e25a0e9e2a8095c04ed0242
parents 8344b3db a8d563cf
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -6790,7 +6790,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
            // The app bounds hasn't been computed yet.
            return false;
        }
        final Configuration parentConfig = getParent().getConfiguration();
        final WindowContainer parent = getParent();
        if (parent == null) {
            // The parent of detached Activity can be null.
            return false;
        }
        final Configuration parentConfig = parent.getConfiguration();
        // Although colorMode, screenLayout, smallestScreenWidthDp are also fixed, generally these
        // fields should be changed with density and bounds, so here only compares the most
        // significant field.