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

Commit 5c53d8fd authored by Pawan Wagh's avatar Pawan Wagh
Browse files

Don't show PageSizeCompat dialog when disabled through setting 

Flag: android.content.pm.app_compat_option_16kb
Test: atest -c FileSystemUtilsTests
Test: Install 4KB aligned app and see the dialog on
16 KB device
Bug: 385749375

Change-Id: Ic1f9f2b53ab496208274072ed723f0283a5e4ad0
parent b5f7621b

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;

        }