Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 8ebc6e80b8" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-03 17:26:31 +00:00
committed by Android (Google) Code Review
parent b48b0bc153 2771de2d56
commit c56c32172e
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
View File

@@ -616,11 +616,12 @@ public class RestrictedLockUtils {
*/ */
public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
final Intent intent = getShowAdminSupportDetailsIntent(context, admin); final Intent intent = getShowAdminSupportDetailsIntent(context, admin);
int adminUserId = UserHandle.myUserId(); int targetUserId = UserHandle.myUserId();
if (admin.userId != UserHandle.USER_NULL) { if (admin != null && admin.userId != UserHandle.USER_NULL
adminUserId = admin.userId; && isCurrentUserOrProfile(context, admin.userId)) {
targetUserId = admin.userId;
} }
context.startActivityAsUser(intent, new UserHandle(adminUserId)); context.startActivityAsUser(intent, new UserHandle(targetUserId));
} }
public static Intent getShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { public static Intent getShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
@@ -638,6 +639,28 @@ public class RestrictedLockUtils {
return intent; return intent;
} }
public static boolean isCurrentUserOrProfile(Context context, int userId) {
UserManager um = UserManager.get(context);
for (UserInfo userInfo : um.getProfiles(UserHandle.myUserId())) {
if (userInfo.id == userId) {
return true;
}
}
return false;
}
public static boolean isAdminInCurrentUserOrProfile(Context context, ComponentName admin) {
DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
Context.DEVICE_POLICY_SERVICE);
UserManager um = UserManager.get(context);
for (UserInfo userInfo : um.getProfiles(UserHandle.myUserId())) {
if (dpm.isAdminActiveAsUser(admin, userInfo.id)) {
return true;
}
}
return false;
}
public static void setTextViewPadlock(Context context, public static void setTextViewPadlock(Context context,
TextView textView, boolean showPadlock) { TextView textView, boolean showPadlock) {
final SpannableStringBuilder sb = new SpannableStringBuilder(textView.getText()); final SpannableStringBuilder sb = new SpannableStringBuilder(textView.getText());