Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-18 18:34:16 +00:00
committed by Android (Google) Code Review
parent 6456c828a2 da1e7e569f
commit df786ca150
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

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

9
core/java/android/view/textservice/TextServicesManager.java
View File

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