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

Commit 220fcc24 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14096390, 14096391] into sc-release 

Change-Id: I5aba101df7c42728ce08eaab2a2197dc325786ca
parents 6abf45df fe5ed92b

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+6 −0
Original line number Diff line number Diff line
@@ -2800,6 +2800,12 @@ public class ParsingPackageUtils { 
    }



    private void convertSplitPermissions(ParsingPackage pkg) {

        // STOPSHIP(b/183905675): REMOVE THIS TERRIBLE, HORRIBLE, NO GOOD, VERY BAD HACK

        if ("com.android.chrome".equals(pkg.getPackageName())

                && 445500383 == pkg.getVersionCode()) {

            pkg.setTargetSdkVersion(Build.VERSION_CODES.R);

        }



        final int listSize = mSplitPermissionInfos.size();

        for (int is = 0; is < listSize; is++) {

            final PermissionManager.SplitPermissionInfo spi = mSplitPermissionInfos.get(is);

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+6 −4
Original line number Diff line number Diff line
@@ -301,11 +301,13 @@ public class VolumeDialogImpl implements VolumeDialog, 
        // the volume dialog container itself, so this is fine.

        for (int i = 0; i < mDialogView.getChildCount(); i++) {

            final View view = mDialogView.getChildAt(i);

            final int[] locInWindow = new int[2];

            view.getLocationInWindow(locInWindow);

            mTouchableRegion.op(

                    view.getLeft(),

                    view.getTop(),

                    view.getRight(),

                    view.getBottom(),

                    locInWindow[0],

                    locInWindow[1],

                    locInWindow[0] + view.getWidth(),

                    locInWindow[1] + view.getHeight(),

                    Region.Op.UNION);

        }