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

Commit bc2f1a6c authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Do not read bounds from intent"

parents 38f43137 56f171d4

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+4 −10
Original line number Diff line number Diff line
@@ -1863,19 +1863,13 @@ public final class ActivityStackSupervisor implements DisplayListener { 


        boolean overrideBounds = false;

        Rect newBounds = null;

        if (r.info.resizeable || (inTask != null && inTask.mResizeable)) {

            if (intent.hasExtra(ActivityOptions.KEY_BOUNDS)) {

                overrideBounds = true;

                newBounds = Rect.unflattenFromString(

                        intent.getStringExtra(ActivityOptions.KEY_BOUNDS));

            } else if (options != null) {

        if (options != null && (r.info.resizeable || (inTask != null && inTask.mResizeable))) {

            ActivityOptions opts = new ActivityOptions(options);

            if (opts.hasBounds()) {

                overrideBounds = true;

                newBounds = opts.getBounds();

            }

        }

        }



        // In some flows in to this function, we retrieve the task record and hold on to it

        // without a lock before calling back in to here...  so the task at this point may