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

Merge "Minor clean ups on InputMethodUtils and SubtypeUtils"

Browse Source
This commit is contained in:
Antonio Kantek
2022-07-14 17:15:13 +00:00
committed by Android (Google) Code Review
parent f4c118e03a b12fdf9b37
commit 45cfd525ec
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/inputmethod/InputMethodUtils.java
View File

@@ -142,7 +142,7 @@ final class InputMethodUtils {
}
continue;
}
ApplicationInfo ai = null;
ApplicationInfo ai;
try {
ai = packageManagerForUser.getApplicationInfo(packageName,
PackageManager.ApplicationInfoFlags.of(

19
services/core/java/com/android/server/inputmethod/SubtypeUtils.java
View File

@@ -85,8 +85,8 @@ final class SubtypeUtils {
continue;
}
}
if (mode == SUBTYPE_MODE_ANY || TextUtils.isEmpty(mode) ||
mode.equalsIgnoreCase(subtype.getMode())) {
if (mode == SUBTYPE_MODE_ANY || TextUtils.isEmpty(mode)
|| mode.equalsIgnoreCase(subtype.getMode())) {
return true;
}
}
@@ -237,17 +237,20 @@ final class SubtypeUtils {
/**
* If there are no selected subtypes, tries finding the most applicable one according to the
* given locale.
* @param subtypes this function will search the most applicable subtype in subtypes
* @param mode subtypes will be filtered by mode
* @param locale subtypes will be filtered by locale
* @param canIgnoreLocaleAsLastResort if this function can't find the most applicable subtype,
* it will return the first subtype matched with mode
*
* @param subtypes a list of {@link InputMethodSubtype} to search
* @param mode the mode used for filtering subtypes
* @param locale the locale used for filtering subtypes
* @param canIgnoreLocaleAsLastResort when set to {@code true}, if this function can't find the
* most applicable subtype, it will return the first subtype
* matched with mode
*
* @return the most applicable subtypeId
*/
static InputMethodSubtype findLastResortApplicableSubtypeLocked(
Resources res, List<InputMethodSubtype> subtypes, String mode, String locale,
boolean canIgnoreLocaleAsLastResort) {
if (subtypes == null || subtypes.size() == 0) {
if (subtypes == null || subtypes.isEmpty()) {
return null;
}
if (TextUtils.isEmpty(locale)) {