diff options
4 files changed, 7 insertions, 10 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b9fcb9ca6045..87a44ced026e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1012,7 +1012,6 @@ package android.content { field public static final java.lang.String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK"; field public static final java.lang.String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED"; field public static final java.lang.String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP"; - field public static final java.lang.String EXTRA_USER_ID = "android.intent.extra.USER_ID"; field public static final java.lang.String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE"; } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 8913748e0c48..c0463e9ae7af 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4453,7 +4453,6 @@ public class Intent implements Parcelable, Cloneable { * * @hide */ - @SystemApi public static final String EXTRA_USER_ID = "android.intent.extra.USER_ID"; /** @@ -5009,8 +5008,7 @@ public class Intent implements Parcelable, Cloneable { "android.intent.extra.user_handle"; /** - * The UserHandle carried with broadcasts intents related to addition and removal of managed - * profiles - {@link #ACTION_MANAGED_PROFILE_ADDED} and {@link #ACTION_MANAGED_PROFILE_REMOVED}. + * The UserHandle carried with intents. */ public static final String EXTRA_USER = "android.intent.extra.USER"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index c6e457436025..9caec12e7844 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1473,12 +1473,13 @@ public final class Settings { * <p> If an user action is disabled by policy, this dialog can be triggered to let * the user know about this. * <p> - * Input: Nothing. + * Input: {@link Intent#EXTRA_USER}: The user of the admin. * <p> * Output: Nothing. * * @hide */ + // Intent#EXTRA_USER_ID can also be used @SystemApi @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS diff --git a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java index e278c10a2c59..8529e3ef8420 100644 --- a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java +++ b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java @@ -80,11 +80,10 @@ public class RestrictedLockUtils { if (admin.component != null) { intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin.component); } - int adminUserId = UserHandle.myUserId(); - if (admin.user != null) { - adminUserId = admin.user.getIdentifier(); - } - intent.putExtra(Intent.EXTRA_USER_ID, adminUserId); + final UserHandle adminUser = admin.user != null + ? admin.user + : UserHandle.of(UserHandle.myUserId()); + intent.putExtra(Intent.EXTRA_USER, adminUser); } return intent; } |