PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make distinction between null and empty IM list."

Browse Source
This commit is contained in:
Pavel Grafov
2022-02-11 12:13:28 +00:00
committed by Android (Google) Code Review
parent 0b44b6061f 0b3c4b8a53
commit f8ba876fbe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
View File

@@ -159,7 +159,7 @@ public class AvailableVirtualKeyboardFragment extends DashboardFragment
// allowed by organization. Doing so will allow the user to disable the input method and // allowed by organization. Doing so will allow the user to disable the input method and
// remain complaint with the organization's policy. Once disabled, the input method // remain complaint with the organization's policy. Once disabled, the input method
// cannot be re-enabled because it is not in the permitted list. // cannot be re-enabled because it is not in the permitted list.
final boolean isAllowedByOrganization = permittedList.isEmpty() final boolean isAllowedByOrganization = permittedList == null
|| permittedList.contains(imi.getPackageName()) || permittedList.contains(imi.getPackageName())
|| enabledImis.contains(imi); || enabledImis.contains(imi);
final InputMethodPreference pref = new InputMethodPreference(prefContext, imi, final InputMethodPreference pref = new InputMethodPreference(prefContext, imi,