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

Commit 73b38b49 authored by Jeremy Meyer's avatar Jeremy Meyer Committed by Android (Google) Code Review
Browse files

Merge "Allow disk reads when context creates LocaleConfig" into main

parents 3a29f20f 88bbe820
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -3484,9 +3484,20 @@ class ContextImpl extends Context {
        // only do this if the user already has more than one preferred locale
        if (android.content.res.Flags.defaultLocale()
                && r.getConfiguration().getLocales().size() > 1) {
            LocaleConfig lc = getUserId() < 0
                    ? LocaleConfig.fromContextIgnoringOverride(this)
                    : new LocaleConfig(this);
            LocaleConfig lc;
            if (getUserId() < 0) {
                lc = LocaleConfig.fromContextIgnoringOverride(this);
            } else {
                // This is needed because the app might have locale config overrides that need to
                // be read from disk in order for resources to correctly choose which values to
                // load.
                StrictMode.ThreadPolicy policy = StrictMode.allowThreadDiskReads();
                try {
                    lc = new LocaleConfig(this);
                } finally {
                    StrictMode.setThreadPolicy(policy);
                }
            }
            mResourcesManager.setLocaleConfig(lc);
        }
    }