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

Commit f8ba876f authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

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

parents 0b44b606 0b3c4b8a

src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class AvailableVirtualKeyboardFragment extends DashboardFragment 
            // 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

            // 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())

                    || enabledImis.contains(imi);

            final InputMethodPreference pref = new InputMethodPreference(prefContext, imi,