diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-10-09 15:49:54 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2018-10-09 15:58:50 -0700 |
| commit | 54ff6b0138b45da95b81bfecdddae6eb27089edb (patch) | |
| tree | dc50867f01fad5eead175cd43491fc23d1e35c79 | |
| parent | 421f1a152c44192bff66ff99a13af8080c6b618c (diff) | |
Use public method in RestrictedLockUtils#isCurrentUserOrProfile
No need for new system API
Test: Built
Bug: 116798569
Change-Id: Iec6b29f8e47037854b36556a03e1f044dcaa5136
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 1 | ||||
| -rw-r--r-- | packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java | 8 |
3 files changed, 1 insertions, 9 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 30a0c850f865..1a43e32cc08b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4137,7 +4137,6 @@ package android.os { public class UserManager { method public void clearSeedAccountData(); - method public int[] getProfileIds(int, boolean); method public java.lang.String getSeedAccountName(); method public android.os.PersistableBundle getSeedAccountOptions(); method public java.lang.String getSeedAccountType(); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 128217001b17..1d977d4752a9 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -2363,7 +2363,6 @@ public class UserManager { */ @RequiresPermission(anyOf = {Manifest.permission.MANAGE_USERS, Manifest.permission.CREATE_USERS}, conditional = true) - @SystemApi public @NonNull int[] getProfileIds(@UserIdInt int userId, boolean enabledOnly) { try { return mService.getProfileIds(userId, enabledOnly); diff --git a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java index 738181d76c2a..bac45d3d35e8 100644 --- a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java +++ b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java @@ -91,13 +91,7 @@ public class RestrictedLockUtils { public static boolean isCurrentUserOrProfile(Context context, int userId) { UserManager um = context.getSystemService(UserManager.class); - int[] userIds = um.getProfileIds(UserHandle.myUserId(), true); - for (int i = 0; i < userIds.length; i++) { - if (userIds[i] == userId) { - return true; - } - } - return false; + return um.getUserProfiles().contains(UserHandle.of(userId)); } public static class EnforcedAdmin { |