PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS

Browse Source 
Test: Built
Bug: 116798569
Change-Id: Idbb1e7c6efbde57c00e96d7d9a2aefb233b94586
This commit is contained in:
Philip P. Moltmann
2018-10-08 15:56:51 -07:00
parent 035ea3b0d1
commit fe9059b11d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
View File

@@ -59,11 +59,15 @@ public class ActionDisabledByAdminDialog extends Activity
}
admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
if (userId == UserHandle.USER_NULL) {
admin.user = null;
if (intent.hasExtra(Intent.EXTRA_USER)) {
admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);
} else {
admin.user = UserHandle.of(userId);
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;
}