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

Commit 976da2d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mitigate CropView invalid Range crash" into main

parents 793a7090 646174c9

packages/SystemUI/aconfig/systemui.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -504,6 +504,15 @@ flag { 
    }

}



flag {

    name: "screenshot_scroll_crop_view_crash_fix"

    namespace: "systemui"

    description: "Mitigate crash on invalid computed range in CropView"

    bug: "232633995"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "screenshot_private_profile_behavior_fix"

packages/SystemUI/src/com/android/systemui/screenshot/scroll/CropView.java

+9 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import androidx.customview.widget.ExploreByTouchHelper; 
import androidx.interpolator.view.animation.FastOutSlowInInterpolator;



import com.android.internal.graphics.ColorUtils;

import com.android.systemui.Flags;

import com.android.systemui.res.R;



import java.util.List;
@@ -378,8 +379,14 @@ public class CropView extends View { 
                upper = 1;

                break;

        }

        Log.i(TAG, "getAllowedValues: " + boundary + ", "

                + "result=[lower=" + lower + ", upper=" + upper + "]");

        if (lower >= upper) {

            Log.wtf(TAG, "getAllowedValues computed an invalid range "

                    + "[" + lower + ", " + upper + "]");

            if (Flags.screenshotScrollCropViewCrashFix()) {

                lower = Math.min(lower, upper);

                upper = lower;

            }

        }

        return new Range<>(lower, upper);

    }