| commit | 57378939c51541166ea670c1ddea963bd04a567e | [log] [tgz] |
|---|---|---|
| author | Eric Sandness <sandness@google.com> | Tue Mar 27 13:22:52 2018 +0100 |
| committer | Eric Sandness <sandness@google.com> | Tue Mar 27 17:30:30 2018 +0000 |
| tree | d294c8b9e218e2e2a1742224301830be6f16cac3 | |
| parent | 678c0286be37820a246b0a5b9105790e139d7916 [diff] |
Permission Check For DPM Get IME API Require the caller of DPM.getPermittedInputMethodsForCurrentUser() to hold the MANAGE_USERS permission. The only callers should be settings apps which already hold this permission. Bug: 62343414 Test: Manage IME list in the Settings app Test: com.google.android.gts.devicepolicy.DeviceOwnerTest#testPermitInputMethods Change-Id: I0d162f8f51d16e403a950ee5d942502c2cf20181
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 3015398..d0d6301 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -6340,6 +6340,7 @@ * @hide */ @SystemApi + @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public @Nullable List<String> getPermittedInputMethodsForCurrentUser() { throwIfParentInstance("getPermittedInputMethodsForCurrentUser"); if (mService != null) {
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 1e216a3..160016d 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8738,6 +8738,7 @@ @Override public List getPermittedInputMethodsForCurrentUser() { + enforceManageUsers(); UserInfo currentUser; try { currentUser = mInjector.getIActivityManager().getCurrentUser();