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

Merge "Remove restricted uitls methods for cross-profile calendar." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-19 05:24:24 +00:00
committed by Android (Google) Code Review
parent b99646c3a3 feb79784fa
commit ee187db646
1 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
View File

@@ -38,7 +38,6 @@ import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
import android.text.style.ImageSpan;
import android.util.Log;
import android.view.MenuItem;
import android.widget.TextView;
@@ -47,7 +46,6 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils;
import java.util.List;
import java.util.Set;
/**
* Utility class to host methods usable in adding a restricted padlock icon and showing admin
@@ -310,43 +308,6 @@ public class RestrictedLockUtilsInternal extends RestrictedLockUtils {
return null;
}
/**
* @param userId user id of a managed profile.
* @return profile owner admin if cross profile calendar is disallowed.
*/
public static EnforcedAdmin getCrossProfileCalendarEnforcingAdmin(Context context, int userId) {
final Context managedProfileContext = createPackageContextAsUser(
context, userId);
final DevicePolicyManager dpm = managedProfileContext.getSystemService(
DevicePolicyManager.class);
if (dpm == null) {
return null;
}
final EnforcedAdmin admin = getProfileOwner(context, userId);
if (admin == null) {
return null;
}
final Set<String> packages = dpm.getCrossProfileCalendarPackages();
if (packages != null && packages.isEmpty()) {
return admin;
}
return null;
}
/**
* @param userId user id of a managed profile.
* @return a context created from the given context for the given user, or null if it fails.
*/
private static Context createPackageContextAsUser(Context context, int userId) {
try {
return context.createPackageContextAsUser(
context.getPackageName(), 0 /* flags */, UserHandle.of(userId));
} catch (PackageManager.NameNotFoundException e) {
Log.e(LOG_TAG, "Failed to create user context", e);
}
return null;
}
public static EnforcedAdmin checkIfAccessibilityServiceDisallowed(Context context,
String packageName, int userId) {
DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(