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

Commit c719eea3 authored by Pawan Wagh's avatar Pawan Wagh Committed by Android (Google) Code Review
Browse files

Merge "Don't show PageSizeCompat dialog when disabled through setting" into main

parents 54ef979e 5c53d8fd

services/core/java/com/android/server/pm/PackageSetting.java

+4 −2
Original line number Diff line number Diff line
@@ -1848,8 +1848,10 @@ public class PackageSetting extends SettingBase implements PackageStateInternal 
        boolean manifestOverrideEnabled =  (mPageSizeAppCompatFlags

                & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_ENABLED) != 0;

        boolean settingsOverrideEnabled =  (mPageSizeAppCompatFlags

                & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_ENABLED) != 0;

        if (manifestOverrideEnabled || settingsOverrideEnabled) {

                & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_ENABLED) != 0;

        boolean settingsOverrideDisabled =  (mPageSizeAppCompatFlags

                & ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_SETTINGS_OVERRIDE_DISABLED) != 0;

        if (manifestOverrideEnabled || settingsOverrideEnabled || settingsOverrideDisabled) {

            return null;

        }