diff options
| author | Eric Sandness <sandness@google.com> | 2019-02-18 14:25:11 +0000 |
|---|---|---|
| committer | Eric Sandness <sandness@google.com> | 2019-02-19 12:48:29 +0000 |
| commit | 147d274f31d5baebb196cdace3b3c6b6e6abbe07 (patch) | |
| tree | b6db859faba34601750c68f20a941d413f628a65 /core/java/android | |
| parent | e4f26ef212666a2d605261026d36c30a339f2bbf (diff) | |
Doc Change For DPM.setPermittedInputMethods
Update javadoc to say that setPermittedInputMethods only restricts the
IMEs inside the profile when called by a Profile Owner. In the past, a
Profile Owner could restrict the IMEs used across the entire device.
Change-Id: If1df3509327ef131a21db5645d9e2378622800e6
Bug: 124291520
Test: atest android.admin.cts.DevicePolicyManagerTest
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 806536b6947c..3587c68ef234 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -7036,9 +7036,9 @@ public class DevicePolicyManager { } /** - * Called by a profile or device owner to set the permitted input methods services. When set by - * a device owner or profile owner the restriction applies to all profiles of the user the - * device owner or profile owner is an admin for. By default, the user can use any input method. + * Called by a profile or device owner to set the permitted input methods services for this + * user. By default, the user can use any input method. + * <p> * When zero or more packages have been added, input method that are not in the list and not * part of the system can not be enabled by the user. This method will fail if it is called for * a admin that is not for the foreground user or a profile of the foreground user. Any @@ -7047,7 +7047,7 @@ public class DevicePolicyManager { * Calling with a null value for the list disables the restriction so that all input methods can * be used, calling with an empty list disables all but the system's own input methods. * <p> - * System input methods are always available to the user this method can't modify this. + * System input methods are always available to the user - this method can't modify this. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param packageNames List of input method package names. |