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

Commit cf359393 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Remove enabled flag reduce_unnecessary_measure 

Bug: 419312922
Flag: EXEMPT flag removal
Test: CtsWindowManagerDeviceWindow
Change-Id: I765d019e7ac4e60408ebdd308116ee45275349a0
parent a08a0293

core/java/android/view/ViewRootImpl.java

+2 −15
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FIT_INSETS_CO 
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_SIZE_EXTENDED_BY_CUTOUT;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_OPTIMIZE_MEASURE;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_OVERRIDE_LAYOUT_IN_DISPLAY_CUTOUT_MODE;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SYSTEM_APPLICATION_OVERLAY;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
@@ -3509,17 +3508,6 @@ public final class ViewRootImpl implements ViewParent, 
                || lp.type == TYPE_VOLUME_OVERLAY;

    }













    /**













     * @return {@code true} if we should reduce unnecessary measure for the window.













     * TODO(b/260382739): Apply this to all windows.













     */













    private static boolean shouldOptimizeMeasure(final WindowManager.LayoutParams lp) {













        if (com.android.window.flags.Flags.reduceUnnecessaryMeasure()) {













            return true;













        }













        return (lp.privateFlags & PRIVATE_FLAG_OPTIMIZE_MEASURE) != 0;













    }



























    private Rect getWindowBoundsInsetSystemBars() {















        final Rect bounds = new Rect(















                mContext.getResources().getConfiguration().windowConfiguration.getBounds());










@@ -3584,7 +3572,6 @@ public final class ViewRootImpl implements ViewParent,













        mAppVisibilityChanged = false;















        final boolean viewUserVisibilityChanged = !mFirst &&















                ((mViewVisibility == View.VISIBLE) != (viewVisibility == View.VISIBLE));













        final boolean shouldOptimizeMeasure = shouldOptimizeMeasure(lp);





























        WindowManager.LayoutParams params = null;















        Rect frame = mWinFrame;










@@ -3709,7 +3696,7 @@ public final class ViewRootImpl implements ViewParent,



























            // Ask host how big it wants to be















            windowSizeMayChange |= measureHierarchy(host, lp, mView.getContext().getResources(),













                    desiredWindowWidth, desiredWindowHeight, shouldOptimizeMeasure);













                    desiredWindowWidth, desiredWindowHeight, true /* forRootSizeOnly */);















        }





























        if (collectViewAttributes()) {










@@ -3750,7 +3737,7 @@ public final class ViewRootImpl implements ViewParent,













                // change due to fitting system windows, which can happen a lot.















                windowSizeMayChange |= measureHierarchy(host, lp,















                        mView.getContext().getResources(), desiredWindowWidth, desiredWindowHeight,













                        shouldOptimizeMeasure);













                        true /* forRootSizeOnly */);















            }















        }















































core/java/android/window/flags/windowing_frontend.aconfig



+0
−11




























Original line number
Diff line number
Diff line








@@ -246,17 +246,6 @@ flag {













  }















}





























flag {













  name: "reduce_unnecessary_measure"













  namespace: "windowing_frontend"













  description: "Skip measuring view hierarchy if the size is known"













  bug: "260382739"













  is_fixed_read_only: true













  metadata {













    purpose: PURPOSE_BUGFIX













  }













}





























flag {















  name: "ensure_keyguard_does_transition_starting"















  namespace: "windowing_frontend"