diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/view/textservice/TextServicesManager.java | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 70294cbf8503..e1cb5e4f062a 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -52312,7 +52312,7 @@ package android.view.textservice { public final class TextServicesManager { method @Nullable public android.view.textservice.SpellCheckerInfo getCurrentSpellCheckerInfo(); - method @Nullable public java.util.List<android.view.textservice.SpellCheckerInfo> getEnabledSpellCheckerInfos(); + method @NonNull public java.util.List<android.view.textservice.SpellCheckerInfo> getEnabledSpellCheckerInfos(); method public boolean isSpellCheckerEnabled(); method @Nullable public android.view.textservice.SpellCheckerSession newSpellCheckerSession(@Nullable android.os.Bundle, @Nullable java.util.Locale, @NonNull android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean); method @Nullable public android.view.textservice.SpellCheckerSession newSpellCheckerSession(@Nullable android.os.Bundle, @Nullable java.util.Locale, @NonNull android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean, int); diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java index 6fb01a309402..4f6fa272e103 100644 --- a/core/java/android/view/textservice/TextServicesManager.java +++ b/core/java/android/view/textservice/TextServicesManager.java @@ -37,6 +37,7 @@ import com.android.internal.textservice.ISpellCheckerSessionListener; import com.android.internal.textservice.ITextServicesManager; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Locale; @@ -288,15 +289,15 @@ public final class TextServicesManager { } /** - * Retrieve the list of currently enabled spell checkers, or null if there is none. + * Retrieve the list of currently enabled spell checkers. * * @return The list of currently enabled spell checkers. */ - @Nullable - @SuppressLint("NullableCollection") + @NonNull public List<SpellCheckerInfo> getEnabledSpellCheckerInfos() { final SpellCheckerInfo[] enabledSpellCheckers = getEnabledSpellCheckers(); - return enabledSpellCheckers != null ? Arrays.asList(enabledSpellCheckers) : null; + return enabledSpellCheckers != null + ? Arrays.asList(enabledSpellCheckers) : Collections.emptyList(); } /** |