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

Merge "Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-17 00:26:37 +00:00
committed by Android (Google) Code Review
parent 9c072cd621 fe9059b11d
commit c496feec04
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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