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

Commit a8d563cf authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Android (Google) Code Review
Browse files

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

parents 71cf0b48 82378198
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.