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

Commit df786ca1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Return an empty list instead of null." into sc-dev

parents 6456c828 da1e7e56

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

























core/java/android/view/textservice/TextServicesManager.java



+5
−4




























Original line number
Diff line number
Diff line








@@ -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();















    }































    /**