Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS
Test: Built Bug: 116798569 Change-Id: Idbb1e7c6efbde57c00e96d7d9a2aefb233b94586
This commit is contained in:
@@ -59,12 +59,16 @@ public class ActionDisabledByAdminDialog extends Activity
|
||||
}
|
||||
admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
|
||||
|
||||
if (intent.hasExtra(Intent.EXTRA_USER)) {
|
||||
admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);
|
||||
} else {
|
||||
int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
|
||||
if (userId == UserHandle.USER_NULL) {
|
||||
admin.user = null;
|
||||
} else {
|
||||
admin.user = UserHandle.of(userId);
|
||||
}
|
||||
}
|
||||
return admin;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user