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

Commit 4d728de8 authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf425 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663



Change-Id: Ifa5695455810d3c54239463a0c6aae447e08b09e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2034695a 9d6cf425

src/com/android/settings/applications/AppLocaleUtil.java

+7 −7
Original line number Diff line number Diff line
@@ -49,17 +49,17 @@ public class AppLocaleUtil { 
        boolean isDisallowedPackage = isDisallowedPackage(context, packageName);

        boolean hasLauncherEntry = hasLauncherEntry(packageName, infos);

        boolean isSignedWithPlatformKey = isSignedWithPlatformKey(context, packageName);

        boolean isAppLocaleSupported = isAppLocaleSupported(context, packageName);

        boolean canDisplay = !isDisallowedPackage

                && !isSignedWithPlatformKey

                && hasLauncherEntry

                && isAppLocaleSupported(context, packageName);



        Log.i(TAG, "Can display preference - [" + packageName + "] :"

                + " isDisallowedPackage : " + isDisallowedPackage

                + " / isSignedWithPlatformKey : " + isSignedWithPlatformKey

                + " / hasLauncherEntry : " + hasLauncherEntry

                + " / isAppLocaleSupported : " + isAppLocaleSupported);



        return !isDisallowedPackage

                && !isSignedWithPlatformKey

                && hasLauncherEntry

                && isAppLocaleSupported;

                + " / canDisplay : " + canDisplay);

        return canDisplay;

    }



    private static boolean isDisallowedPackage(Context context, String packageName) {