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

Commit 0b3c4b8a authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Make distinction between null and empty IM list. 

* null means no policy is enfrced, any IM is allowed.
* empty means no IMs is allowed except system IMs.

Bug: 211063191
Test: manual, CtsVerifier/BYOD managed provisioning/Policy transparency
Change-Id: I35665a547c1e99129c70c834083b3183ba00208d
parent 949ee051

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

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