diff options
| author | Raph Levien <raph@google.com> | 2016-05-03 00:15:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-03 00:15:24 +0000 |
| commit | 4d826831b5a516184e2323ce619b317e658d475a (patch) | |
| tree | 06a93422ce4a67a58bea8ed8f9118d2814774bf9 /core/java/android | |
| parent | ef1513b0380887dad352afb073e6e995b5521c32 (diff) | |
| parent | 10ea92aefa7051eb432383e0b56e7c44664fd560 (diff) | |
Merge "Make LocaleList constructor non-nullable" into nyc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 4 | ||||
| -rw-r--r-- | core/java/android/text/style/LocaleSpan.java | 2 | ||||
| -rw-r--r-- | core/java/android/util/LocaleList.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 177374c7abc8..2d0e74cf5e8c 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -744,7 +744,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration private void fixUpLocaleList() { if ((locale == null && !mLocaleList.isEmpty()) || (locale != null && !locale.equals(mLocaleList.get(0)))) { - mLocaleList = new LocaleList(locale); + mLocaleList = locale == null ? LocaleList.getEmptyLocaleList() : new LocaleList(locale); } } @@ -1481,7 +1481,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration * @param loc The locale. Can be null. */ public void setLocale(@Nullable Locale loc) { - setLocales(new LocaleList(loc)); + setLocales(loc == null ? LocaleList.getEmptyLocaleList() : new LocaleList(loc)); } /** diff --git a/core/java/android/text/style/LocaleSpan.java b/core/java/android/text/style/LocaleSpan.java index 4f687c857362..91990dfd1db2 100644 --- a/core/java/android/text/style/LocaleSpan.java +++ b/core/java/android/text/style/LocaleSpan.java @@ -50,7 +50,7 @@ public class LocaleSpan extends MetricAffectingSpan implements ParcelableSpan { * @see #LocaleSpan(LocaleList) */ public LocaleSpan(@Nullable Locale locale) { - mLocales = new LocaleList(locale); + mLocales = locale == null ? LocaleList.getEmptyLocaleList() : new LocaleList(locale); } /** diff --git a/core/java/android/util/LocaleList.java b/core/java/android/util/LocaleList.java index b153e925fbb0..3c3db580bb28 100644 --- a/core/java/android/util/LocaleList.java +++ b/core/java/android/util/LocaleList.java @@ -169,8 +169,8 @@ public final class LocaleList implements Parcelable { * @throws NullPointerException if any of the input locales is <code>null</code>. * @throws IllegalArgumentException if any of the input locales repeat. */ - public LocaleList(@Nullable Locale... list) { - if (list == null || list.length == 0) { + public LocaleList(@NonNull Locale... list) { + if (list.length == 0) { mList = sEmptyList; mStringRepresentation = ""; } else { |