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

Commit 5960b940 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android (Google) Code Review
Browse files

Merge "Fix case where some locales may have empty langauges."

parents cab5208a 417bbe01

core/java/android/content/res/Configuration.java

+4 −1
Original line number Diff line number Diff line
@@ -1551,7 +1551,10 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
        }



        if (!config.mLocaleList.isEmpty()) {

            parts.add(localesToResourceQualifier(config.mLocaleList));

            final String resourceQualifier = localesToResourceQualifier(config.mLocaleList);

            if (!resourceQualifier.isEmpty()) {

                parts.add(resourceQualifier);

            }

        }



        switch (config.screenLayout & Configuration.SCREENLAYOUT_LAYOUTDIR_MASK) {