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

RestrictedLockUtils was split into ...Internal

Browse Source 
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
This commit is contained in:
Philip P. Moltmann
2018-08-28 15:01:43 -07:00
parent a59ce66b3b
commit e3f721132a
79 changed files with 358 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/MasterClear.java
View File

@@ -62,6 +62,7 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.List;
@@ -499,11 +500,12 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final Context context = getContext();
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
final UserManager um = UserManager.get(context);
final boolean disallow = !um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(
context, UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
final boolean disallow = !um.isAdminUser() || RestrictedLockUtilsInternal
.hasBaseUserRestriction(context, UserManager.DISALLOW_FACTORY_RESET,
UserHandle.myUserId());
if (disallow && !Utils.isDemoUser(context)) {
return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
} else if (admin != null) {

5
src/com/android/settings/MasterClearConfirm.java
View File

@@ -38,6 +38,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* Confirm and execute a reset of the device to a clean "just out of the box"
@@ -146,9 +147,9 @@ public class MasterClearConfirm extends InstrumentedFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
} else if (admin != null) {

5
src/com/android/settings/ResetNetwork.java
View File

@@ -50,6 +50,7 @@ import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.ArrayList;
import java.util.List;
@@ -240,9 +241,9 @@ public class ResetNetwork extends InstrumentedFragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final UserManager um = UserManager.get(getActivity());
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
if (!um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
if (!um.isAdminUser() || RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
return inflater.inflate(R.layout.network_reset_disallowed_screen, null);
} else if (admin != null) {

5
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -50,6 +50,7 @@ import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.network.ApnSettings;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* Confirm and execute a reset of the network settings to a clean "just out of the box"
@@ -204,9 +205,9 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
return inflater.inflate(R.layout.network_reset_disallowed_screen, null);
} else if (admin != null) {

4
src/com/android/settings/RestrictedCheckBox.java
View File

@@ -24,6 +24,7 @@ import android.util.AttributeSet;
import android.widget.CheckBox;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* A checkbox that can be restricted by device policy, in which case it shows a dialog explaining
@@ -57,7 +58,8 @@ public class RestrictedCheckBox extends CheckBox {
mEnforcedAdmin = admin;
if (mDisabledByAdmin != disabled) {
mDisabledByAdmin = disabled;
RestrictedLockUtils.setTextViewAsDisabledByAdmin(mContext, this, mDisabledByAdmin);
RestrictedLockUtilsInternal.setTextViewAsDisabledByAdmin(mContext, this,
mDisabledByAdmin);
if (mDisabledByAdmin) {
getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color),
PorterDuff.Mode.MULTIPLY);

3
src/com/android/settings/RestrictedRadioButton.java
View File

@@ -25,6 +25,7 @@ import android.widget.RadioButton;
import android.widget.TextView;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
public class RestrictedRadioButton extends RadioButton {
private Context mContext;
@@ -63,7 +64,7 @@ public class RestrictedRadioButton extends RadioButton {
mEnforcedAdmin = admin;
if (mDisabledByAdmin != disabled) {
mDisabledByAdmin = disabled;
RestrictedLockUtils.setTextViewAsDisabledByAdmin(mContext,
RestrictedLockUtilsInternal.setTextViewAsDisabledByAdmin(mContext,
(TextView) this, mDisabledByAdmin);
if (mDisabledByAdmin) {
getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color),

3
src/com/android/settings/RestrictedSettingsFragment.java
View File

@@ -37,6 +37,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* Base class for settings screens that should be pin protected when in restricted mode or
@@ -219,7 +220,7 @@ public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragm
}
public EnforcedAdmin getRestrictionEnforcedAdmin() {
mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getActivity(),
mRestrictionKey, UserHandle.myUserId());
if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {
mEnforcedAdmin.userId = UserHandle.myUserId();

8
src/com/android/settings/UserCredentialsSettings.java
View File

@@ -53,6 +53,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import java.security.UnrecoverableKeyException;
import java.util.ArrayList;
@@ -137,11 +138,12 @@ public class UserCredentialsSettings extends SettingsPreferenceFragment
final String restriction = UserManager.DISALLOW_CONFIG_CREDENTIALS;
final int myUserId = UserHandle.myUserId();
if (!RestrictedLockUtils.hasBaseUserRestriction(getContext(), restriction, myUserId)) {
if (!RestrictedLockUtilsInternal.hasBaseUserRestriction(getContext(), restriction,
myUserId)) {
DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
@Override public void onClick(DialogInterface dialog, int id) {
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
getContext(), restriction, myUserId);
final EnforcedAdmin admin = RestrictedLockUtilsInternal
.checkIfRestrictionEnforced(getContext(), restriction, myUserId);
if (admin != null) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
admin);

4
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -56,8 +56,8 @@ import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.search.SearchIndexable;
@@ -584,7 +584,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
permittedServices == null || permittedServices.contains(packageName);
if (!serviceAllowed && !serviceEnabled) {
final EnforcedAdmin admin =
RestrictedLockUtils.checkIfAccessibilityServiceDisallowed(
RestrictedLockUtilsInternal.checkIfAccessibilityServiceDisallowed(
getActivity(), packageName, UserHandle.myUserId());
if (admin != null) {
preference.setDisabledByAdmin(admin);

5
src/com/android/settings/accounts/AccountRestrictionHelper.java
View File

@@ -19,7 +19,7 @@ import android.annotation.UserIdInt;
import android.content.Context;
import com.android.settings.AccessiblePreferenceCategory;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import java.util.ArrayList;
@@ -51,7 +51,8 @@ public class AccountRestrictionHelper {
}
public boolean hasBaseUserRestriction(String userRestriction, @UserIdInt int userId) {
return RestrictedLockUtils.hasBaseUserRestriction(mContext, userRestriction, userId);
return RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext, userRestriction,
userId);
}
public AccessiblePreferenceCategory createAccessiblePreferenceCategory(Context context) {

3
src/com/android/settings/accounts/ChooseAccountPreferenceController.java
View File

@@ -39,6 +39,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.collect.Maps;
@@ -167,7 +168,7 @@ public class ChooseAccountPreferenceController extends BasePreferenceController
// There's only one provider that matches. If it is disabled by admin show the
// support dialog otherwise run it.
final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfAccountManagementDisabled(
RestrictedLockUtilsInternal.checkIfAccountManagementDisabled(
context, mProviderList.get(0).getType(), mUserHandle.getIdentifier());
if (admin != null) {
mActivity.setResult(RESULT_CANCELED,

3
src/com/android/settings/accounts/ContactSearchPreferenceController.java
View File

@@ -24,6 +24,7 @@ import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.SliceData;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
public class ContactSearchPreferenceController extends BasePreferenceController implements
@@ -52,7 +53,7 @@ public class ContactSearchPreferenceController extends BasePreferenceController
pref.setChecked(isChecked());
if (mManagedUser != null) {
final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =
RestrictedLockUtils.checkIfRemoteContactSearchDisallowed(
RestrictedLockUtilsInternal.checkIfRemoteContactSearchDisallowed(
mContext, mManagedUser.getIdentifier());
pref.setDisabledByAdmin(enforcedAdmin);
}

4
src/com/android/settings/accounts/ProviderPreference.java
View File

@@ -21,7 +21,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.content.Context;
import android.graphics.drawable.Drawable;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
/**
@@ -47,7 +47,7 @@ public class ProviderPreference extends RestrictedPreference {
}
public void checkAccountManagementAndSetDisabled(int userId) {
EnforcedAdmin admin = RestrictedLockUtils.checkIfAccountManagementDisabled(
EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfAccountManagementDisabled(
getContext(), getAccountType(), userId);
setDisabledByAdmin(admin);
}

5
src/com/android/settings/accounts/RemoveAccountPreferenceController.java
View File

@@ -44,6 +44,7 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import java.io.IOException;
@@ -84,8 +85,8 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
@Override
public void onClick(View v) {
if (mUserHandle != null) {
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
UserManager.DISALLOW_MODIFY_ACCOUNTS, mUserHandle.getIdentifier());
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_MODIFY_ACCOUNTS, mUserHandle.getIdentifier());
if (admin != null) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, admin);
return;

10
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -48,7 +48,7 @@ import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -107,10 +107,10 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
@Override
public void onResume() {
super.onResume();
mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
setIntentAndFinish(true, true);

14
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -55,6 +55,7 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.ActionButtonPreference;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -181,10 +182,10 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
@Override
public void onResume() {
if (isAvailable() && !mFinishing) {
mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(mActivity,
UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(mActivity,
UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
mActivity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mActivity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
setIntentAndFinish(true);
@@ -214,10 +215,11 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
return;
}
RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfUninstallBlocked(mActivity,
RestrictedLockUtilsInternal.checkIfUninstallBlocked(mActivity,
packageName, mUserId);
boolean uninstallBlockedBySystem = mAppsControlDisallowedBySystem ||
RestrictedLockUtils.hasBaseUserRestriction(mActivity, packageName, mUserId);
RestrictedLockUtilsInternal.hasBaseUserRestriction(mActivity, packageName,
mUserId);
if (admin != null && !uninstallBlockedBySystem) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mActivity, admin);
} else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {

12
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -50,7 +50,7 @@ import com.android.settings.applications.specialaccess.pictureinpicture
.PictureInPictureDetailPreferenceController;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -210,10 +210,10 @@ public class AppInfoDashboardFragment extends DashboardFragment
public void onResume() {
super.onResume();
final Activity activity = getActivity();
mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(activity,
UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(activity,
UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
activity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
activity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
setIntentAndFinish(true, true);
@@ -338,7 +338,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
&& !mAppsControlDisallowedBySystem
&& !uninstallUpdateDisabled);
if (uninstallUpdatesItem.isVisible()) {
RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getActivity(),
RestrictedLockUtilsInternal.setMenuItemAsDisabledByAdmin(getActivity(),
uninstallUpdatesItem, mAppsControlDisallowedAdmin);
}
}

5
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -67,6 +67,7 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.users.UserDialogs;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import org.xmlpull.v1.XmlPullParserException;
@@ -645,12 +646,12 @@ public class DeviceAdminAdd extends Activity {
private EnforcedAdmin getAdminEnforcingCantRemoveProfile() {
// Removing a managed profile is disallowed if DISALLOW_REMOVE_MANAGED_PROFILE
// is set in the parent rather than the user itself.
return RestrictedLockUtils.checkIfRestrictionEnforced(this,
return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(this,
UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, getParentUserId());
}
private boolean hasBaseCantRemoveProfileRestriction() {
return RestrictedLockUtils.hasBaseUserRestriction(this,
return RestrictedLockUtilsInternal.hasBaseUserRestriction(this,
UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, getParentUserId());
}

4
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -28,7 +28,7 @@ import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.span.LinkSpan;
public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
@@ -45,7 +45,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
@Override
protected boolean isDisabledByAdmin() {
return RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
this, DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId) != null;
}

4
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -31,7 +31,7 @@ import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.span.LinkSpan;
public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
@@ -48,7 +48,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
@Override
protected boolean isDisabledByAdmin() {
return RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
this, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId) != null;
}

3
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -58,6 +58,7 @@ import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.widget.FooterPreference;
@@ -319,7 +320,7 @@ public class FingerprintSettings extends SubSettings {
}
final FooterPreference pref = mFooterPreferenceMixin.createFooterPreference();
final EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
activity, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId);
final AnnotationSpan.LinkInfo adminLinkInfo = new AnnotationSpan.LinkInfo(
ANNOTATION_ADMIN_DETAILS, (view) -> {

4
src/com/android/settings/bluetooth/RestrictionUtils.java
View File

@@ -19,8 +19,8 @@ package com.android.settings.bluetooth;
import android.content.Context;
import android.os.UserHandle;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* A utility class to aid testing.
@@ -36,7 +36,7 @@ public class RestrictionUtils {
* API.
*/
public EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) {
return RestrictedLockUtils.checkIfRestrictionEnforced(
return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
context, restriction, UserHandle.myUserId());
}

4
src/com/android/settings/dashboard/RestrictedDashboardFragment.java
View File

@@ -36,7 +36,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* Base class for settings screens that should be pin protected when in restricted mode or
@@ -213,7 +213,7 @@ public abstract class RestrictedDashboardFragment extends DashboardFragment {
}
public EnforcedAdmin getRestrictionEnforcedAdmin() {
mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getActivity(),
mRestrictionKey, UserHandle.myUserId());
if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {
mEnforcedAdmin.userId = UserHandle.myUserId();

4
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -47,8 +47,8 @@ import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.AppItem;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoaderCompat;
@@ -264,7 +264,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
}
private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {
final EnforcedAdmin admin = RestrictedLockUtils.checkIfMeteredDataRestricted(
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted(
getContext(), mPackageName, UserHandle.getUserId(mAppItem.key));
if (mRestrictBackground != null) {
mRestrictBackground.setChecked(!restrictBackground);

2
src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
View File

@@ -13,7 +13,7 @@
*/
package com.android.settings.datausage;
import static com.android.settingslib.RestrictedLockUtils.checkIfMeteredDataRestricted;
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataRestricted;
import android.content.Context;
import android.os.UserHandle;

2
src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
View File

@@ -13,7 +13,7 @@
*/
package com.android.settings.datausage;
import static com.android.settingslib.RestrictedLockUtils.checkIfMeteredDataRestricted;
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataRestricted;
import android.app.Application;
import android.content.Context;

3
src/com/android/settings/datetime/AutoTimePreferenceController.java
View File

@@ -23,6 +23,7 @@ import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -74,6 +75,6 @@ public class AutoTimePreferenceController extends AbstractPreferenceController
}
private RestrictedLockUtils.EnforcedAdmin getEnforcedAdminProperty() {
return RestrictedLockUtils.checkIfAutoTimeRequired(mContext);
return RestrictedLockUtilsInternal.checkIfAutoTimeRequired(mContext);
}
}

3
src/com/android/settings/development/StayAwakePreferenceController.java
View File

@@ -30,6 +30,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -130,7 +131,7 @@ public class StayAwakePreferenceController extends DeveloperOptionsPreferenceCon
// will lock... in this case we can't allow the user to turn
// on "stay awake when plugged in" because that would defeat the
// restriction.
return RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
return RestrictedLockUtilsInternal.checkIfMaximumTimeToLockIsSet(mContext);
}
@VisibleForTesting

5
src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
View File

@@ -28,8 +28,8 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -57,7 +57,8 @@ public class VerifyAppsOverUsbPreferenceController extends DeveloperOptionsPrefe
class RestrictedLockUtilsDelegate {
public EnforcedAdmin checkIfRestrictionEnforced(
Context context, String userRestriction, int userId) {
return RestrictedLockUtils.checkIfRestrictionEnforced(context, userRestriction, userId);
return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context, userRestriction,
userId);
}
}

5
src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
View File

@@ -40,6 +40,7 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -104,9 +105,9 @@ public class BuildNumberPreferenceController extends AbstractPreferenceControlle
@Override
public void onResume() {
mDebuggingFeaturesDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
mDebuggingFeaturesDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
mDebuggingFeaturesDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
mDebuggingFeaturesDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext, UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
mDevHitCountdown = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
? -1 : TAPS_TO_BE_A_DEVELOPER;

8
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -56,6 +56,7 @@ import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
import com.android.settingslib.search.SearchIndexable;
@@ -460,10 +461,11 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
* @return {@code true} iff a intent was shown.
*/
private boolean wasAdminSupportIntentShown(@NonNull String restriction) {
EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
getActivity(), restriction, UserHandle.myUserId());
EnforcedAdmin admin = RestrictedLockUtilsInternal
.checkIfRestrictionEnforced(getActivity(), restriction,
UserHandle.myUserId());
boolean hasBaseUserRestriction =
RestrictedLockUtils.hasBaseUserRestriction(
RestrictedLockUtilsInternal.hasBaseUserRestriction(
getActivity(), restriction, UserHandle.myUserId());
if (admin != null && !hasBaseUserRestriction) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),

5
src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java
View File

@@ -29,6 +29,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
public class FirmwareVersionDialogController implements View.OnClickListener {
@@ -105,9 +106,9 @@ public class FirmwareVersionDialogController implements View.OnClickListener {
@VisibleForTesting
void initializeAdminPermissions() {
mFunDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
mFunDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
mFunDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
mFunDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
}
}

5
src/com/android/settings/display/TimeoutPreferenceController.java
View File

@@ -28,6 +28,7 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
public class TimeoutPreferenceController extends AbstractPreferenceController implements
@@ -65,7 +66,7 @@ public class TimeoutPreferenceController extends AbstractPreferenceController im
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
if (dpm != null) {
final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
RestrictedLockUtilsInternal.checkIfMaximumTimeToLockIsSet(mContext);
final long maxTimeout =
dpm.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
timeoutListPreference.removeUnusableTimeouts(maxTimeout, admin);
@@ -73,7 +74,7 @@ public class TimeoutPreferenceController extends AbstractPreferenceController im
updateTimeoutPreferenceDescription(timeoutListPreference,
Long.parseLong(timeoutListPreference.getValue()));
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT,
UserHandle.myUserId());
if (admin != null) {

4
src/com/android/settings/display/WallpaperPreferenceController.java
View File

@@ -28,7 +28,7 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -80,7 +80,7 @@ public class WallpaperPreferenceController extends AbstractPreferenceController
final String restriction = DISALLOW_SET_WALLPAPER;
if (pref != null) {
pref.setDisabledByAdmin(null);
if (RestrictedLockUtils.hasBaseUserRestriction(mContext,
if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
restriction, UserHandle.myUserId())) {
pref.setEnabled(false);
} else {

5
src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
View File

@@ -41,6 +41,7 @@ import com.android.settings.Utils;
import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.Objects;
@@ -94,7 +95,7 @@ public class ActionDisabledByAdminDialogHelper {
if (admin == null) {
return;
}
if (!RestrictedLockUtils.isAdminInCurrentUserOrProfile(mActivity, admin)
if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
|| !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId)) {
admin = null;
} else {
@@ -156,7 +157,7 @@ public class ActionDisabledByAdminDialogHelper {
}
final DevicePolicyManager dpm = (DevicePolicyManager) activity.getSystemService(
Context.DEVICE_POLICY_SERVICE);
if (!RestrictedLockUtils.isAdminInCurrentUserOrProfile(activity,
if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(activity,
enforcedAdmin.component) || !RestrictedLockUtils.isCurrentUserOrProfile(
activity, enforcedAdmin.userId)) {
enforcedAdmin.component = null;

4
src/com/android/settings/homepage/conditional/HotspotConditionCard.java
View File

@@ -23,7 +23,7 @@ import android.os.UserManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
public class HotspotConditionCard implements ConditionalCard {
@@ -42,7 +42,7 @@ public class HotspotConditionCard implements ConditionalCard {
@Override
public CharSequence getActionText() {
if (RestrictedLockUtils.hasBaseUserRestriction(mAppContext,
if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mAppContext,
UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId())) {
return null;
}

3
src/com/android/settings/homepage/conditional/HotspotConditionController.java
View File

@@ -31,6 +31,7 @@ import com.android.settings.R;
import com.android.settings.TetherSettings;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.Objects;
@@ -75,7 +76,7 @@ public class HotspotConditionController implements ConditionalCardController {
@Override
public void onActionClick() {
final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfRestrictionEnforced(
RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mAppContext, UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
if (admin != null) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mAppContext, admin);

7
src/com/android/settings/location/LocationEnabler.java
View File

@@ -13,7 +13,7 @@
*/
package com.android.settings.location;
import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfRestrictionEnforced;
import static com.android.settingslib.Utils.updateLocationEnabled;
import static com.android.settingslib.Utils.updateLocationMode;
@@ -32,6 +32,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -168,14 +169,14 @@ public class LocationEnabler implements LifecycleObserver, OnResume, OnPause {
mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
if (admin == null) {
admin = RestrictedLockUtils.checkIfRestrictionEnforced(
admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_CONFIG_LOCATION, userId);
}
return admin;
}
boolean hasShareLocationRestriction(int userId) {
return RestrictedLockUtils.hasBaseUserRestriction(
return RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
}

4
src/com/android/settings/network/MobileNetworkPreferenceController.java
View File

@@ -36,7 +36,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -84,7 +84,7 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl
public boolean isUserRestricted() {
return mIsSecondaryUser ||
RestrictedLockUtils.hasBaseUserRestriction(
RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext,
DISALLOW_CONFIG_MOBILE_NETWORKS,
myUserId());

2
src/com/android/settings/network/MobilePlanPreferenceController.java
View File

@@ -20,7 +20,7 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.os.UserHandle.myUserId;
import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
import static com.android.settingslib.RestrictedLockUtilsInternal.hasBaseUserRestriction;
import android.content.ActivityNotFoundException;
import android.content.Context;

6
src/com/android/settings/network/NetworkResetRestrictionChecker.java
View File

@@ -22,7 +22,7 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
public class NetworkResetRestrictionChecker {
@@ -36,13 +36,13 @@ public class NetworkResetRestrictionChecker {
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
boolean hasUserBaseRestriction() {
return RestrictedLockUtils.hasBaseUserRestriction(mContext,
return RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
}
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
boolean isRestrictionEnforcedByAdmin() {
return RestrictedLockUtils.checkIfRestrictionEnforced(
return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId()) != null;
}

2
src/com/android/settings/network/TetherPreferenceController.java
View File

@@ -17,7 +17,7 @@ package com.android.settings.network;
import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfRestrictionEnforced;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;

4
src/com/android/settings/network/VpnPreferenceController.java
View File

@@ -40,7 +40,7 @@ import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -92,7 +92,7 @@ public class VpnPreferenceController extends AbstractPreferenceController
@Override
public boolean isAvailable() {
return !RestrictedLockUtils.hasBaseUserRestriction(mContext,
return !RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId());
}

6
src/com/android/settings/nfc/AndroidBeam.java
View File

@@ -38,7 +38,7 @@ import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
public class AndroidBeam extends InstrumentedFragment
implements SwitchBar.OnSwitchChangeListener {
@@ -68,10 +68,10 @@ public class AndroidBeam extends InstrumentedFragment
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
final UserManager um = UserManager.get(getActivity());
mBeamDisallowedByBase = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
mBeamDisallowedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
if (!mBeamDisallowedByBase && admin != null) {
new ActionDisabledByAdminDialogHelper(getActivity())

4
src/com/android/settings/nfc/AndroidBeamEnabler.java
View File

@@ -22,7 +22,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
/**
@@ -36,7 +36,7 @@ public class AndroidBeamEnabler extends BaseNfcEnabler {
public AndroidBeamEnabler(Context context, RestrictedPreference preference) {
super(context);
mPreference = preference;
mBeamDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(context,
mBeamDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(context,
UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
if (!isNfcAvailable()) {
// NFC is not supported

5
src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
View File

@@ -41,6 +41,7 @@ import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -246,7 +247,7 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen
private void setRestrictedIfNotificationFeaturesDisabled(CharSequence entry,
CharSequence entryValue, int keyguardNotificationFeatures) {
RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, UserHandle.myUserId());
if (admin != null && mLockscreen != null) {
RestrictedListPreference.RestrictedItem item =
@@ -255,7 +256,7 @@ public class LockScreenNotificationPreferenceController extends AbstractPreferen
}
if (mProfileUserId != UserHandle.USER_NULL) {
RestrictedLockUtils.EnforcedAdmin profileAdmin =
RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, mProfileUserId);
if (profileAdmin != null && mLockscreenProfile != null) {
RestrictedListPreference.RestrictedItem item =

4
src/com/android/settings/notification/NotificationSettingsBase.java
View File

@@ -51,7 +51,7 @@ import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.widget.MasterCheckBoxPreference;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.ArrayList;
import java.util.Comparator;
@@ -113,7 +113,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
mPkgInfo = findPackageInfo(mPkg, mUid);
mUserId = UserHandle.getUserId(mUid);
mSuspendedAppsAdmin = RestrictedLockUtils.checkIfApplicationIsSuspended(
mSuspendedAppsAdmin = RestrictedLockUtilsInternal.checkIfApplicationIsSuspended(
mContext, mPkg, mUserId);
loadChannel();

3
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -47,6 +47,7 @@ import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
public class RedactionInterstitial extends SettingsActivity {
@@ -160,7 +161,7 @@ public class RedactionInterstitial extends SettingsActivity {
private void checkNotificationFeaturesAndSetDisabled(RestrictedRadioButton button,
int keyguardNotifications) {
EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
getActivity(), keyguardNotifications, mUserId);
button.setDisabledByAdmin(admin);
}

3
src/com/android/settings/notification/VisibilityPreferenceController.java
View File

@@ -33,6 +33,7 @@ import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.ArrayList;
@@ -128,7 +129,7 @@ public class VisibilityPreferenceController extends NotificationPreferenceContro
private void setRestrictedIfNotificationFeaturesDisabled(RestrictedListPreference pref,
CharSequence entry, CharSequence entryValue, int keyguardNotificationFeatures) {
RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, mAppRow.userId);
if (admin != null) {
RestrictedListPreference.RestrictedItem item =

4
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -64,8 +64,8 @@ import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import java.util.List;
@@ -562,7 +562,7 @@ public class ChooseLockGeneric extends SettingsActivity {
final PreferenceScreen entries = getPreferenceScreen();
int adminEnforcedQuality = mDPM.getPasswordQuality(null, mUserId);
EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal.checkIfPasswordQualityIsSet(
getActivity(), mUserId);
for (ScreenLockType lock : ScreenLockType.values()) {

3
src/com/android/settings/security/ChangeScreenLockPreferenceController.java
View File

@@ -36,6 +36,7 @@ import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.security.screenlock.ScreenLockSettings;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -170,7 +171,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
* DO or PO installed in the user may disallow to change password.
*/
void disableIfPasswordQualityManaged(int userId) {
final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtils
final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtilsInternal
.checkIfPasswordQualityIsSet(mContext, userId);
final DevicePolicyManager dpm = (DevicePolicyManager) mContext
.getSystemService(Context.DEVICE_POLICY_SERVICE);

7
src/com/android/settings/security/LockUnificationPreferenceController.java
View File

@@ -39,7 +39,7 @@ import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -136,8 +136,9 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileUserId);
mUnifyProfile.setChecked(!separate);
if (separate) {
mUnifyProfile.setDisabledByAdmin(RestrictedLockUtils.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_UNIFIED_PASSWORD, mProfileUserId));
mUnifyProfile.setDisabledByAdmin(RestrictedLockUtilsInternal
.checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_UNIFIED_PASSWORD,
mProfileUserId));
}
}
}

4
src/com/android/settings/security/OwnerInfoPreferenceController.java
View File

@@ -27,8 +27,8 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.users.OwnerInfoSettings;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -140,6 +140,6 @@ public class OwnerInfoPreferenceController extends AbstractPreferenceController
@VisibleForTesting
EnforcedAdmin getDeviceOwner() {
return RestrictedLockUtils.getDeviceOwner(mContext);
return RestrictedLockUtilsInternal.getDeviceOwner(mContext);
}
}

3
src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
View File

@@ -34,6 +34,7 @@ import com.android.settings.display.TimeoutListPreference;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
public class LockAfterTimeoutPreferenceController extends AbstractPreferenceController
@@ -106,7 +107,7 @@ public class LockAfterTimeoutPreferenceController extends AbstractPreferenceCont
preference.setValue(String.valueOf(currentTimeout));
if (mDPM != null) {
final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
RestrictedLockUtilsInternal.checkIfMaximumTimeToLockIsSet(mContext);
final long adminTimeout =
mDPM.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
final long displayTimeout = Math.max(0,

3
src/com/android/settings/security/trustagent/TrustAgentManager.java
View File

@@ -39,6 +39,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -113,7 +114,7 @@ public class TrustAgentManager {
final List<ResolveInfo> resolveInfos = pm.queryIntentServices(TRUST_AGENT_INTENT,
PackageManager.GET_META_DATA);
final List<ComponentName> enabledTrustAgents = utils.getEnabledTrustAgents(myUserId);
final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtils
final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtilsInternal
.checkIfKeyguardFeaturesDisabled(
context, DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, myUserId);

6
src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java
View File

@@ -40,7 +40,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.SecurityFeatureProvider;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -97,8 +97,8 @@ public class TrustAgentsPreferenceController extends BasePreferenceController
loadActiveAgents();
removeUselessExistingPreferences();
final EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(mContext,
DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, UserHandle.myUserId());
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
mContext, DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, UserHandle.myUserId());
for (TrustAgentInfo agent : mAvailableAgents.values()) {
final ComponentName componentName = agent.getComponentName();

5
src/com/android/settings/users/EditUserPhotoController.java
View File

@@ -53,6 +53,7 @@ import androidx.fragment.app.Fragment;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.drawable.CircleFramedDrawable;
import libcore.io.Streams;
@@ -419,9 +420,9 @@ public class EditUserPhotoController {
mAction = action;
final int myUserId = UserHandle.myUserId();
mAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
mAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
restriction, myUserId);
mIsRestrictedByBase = RestrictedLockUtils.hasBaseUserRestriction(mContext,
mIsRestrictedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
restriction, myUserId);
}

5
src/com/android/settings/users/UserCapabilities.java
View File

@@ -25,6 +25,7 @@ import android.provider.Settings;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
public class UserCapabilities {
boolean mEnabled = true;
@@ -67,9 +68,9 @@ public class UserCapabilities {
public void updateAddUserCapabilities(Context context) {
final UserManager userManager =
(UserManager) context.getSystemService(Context.USER_SERVICE);
mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
UserManager.DISALLOW_ADD_USER, UserHandle.myUserId());
final boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(
final boolean hasBaseUserRestriction = RestrictedLockUtilsInternal.hasBaseUserRestriction(
context, UserManager.DISALLOW_ADD_USER, UserHandle.myUserId());
mDisallowAddUserSetByAdmin = mEnforcedAdmin != null && !hasBaseUserRestriction;
mDisallowAddUser = (mEnforcedAdmin != null || hasBaseUserRestriction);

4
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -31,7 +31,7 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.List;
@@ -105,7 +105,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
mPhonePref.setChecked(
!mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS));
}
if (RestrictedLockUtils.hasBaseUserRestriction(context,
if (RestrictedLockUtilsInternal.hasBaseUserRestriction(context,
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
removePreference(KEY_REMOVE_USER);
}

4
src/com/android/settings/users/UserPreference.java
View File

@@ -28,7 +28,7 @@ import android.widget.ImageView;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import java.util.Comparator;
@@ -142,7 +142,7 @@ public class UserPreference extends RestrictedPreference {
private boolean canDeleteUser() {
return mDeleteClickListener != null
&& !RestrictedLockUtils.hasBaseUserRestriction(getContext(),
&& !RestrictedLockUtilsInternal.hasBaseUserRestriction(getContext(),
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
}

5
src/com/android/settings/users/UserSettings.java
View File

@@ -72,6 +72,7 @@ import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchBarController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.drawable.CircleFramedDrawable;
import com.android.settingslib.search.SearchIndexable;
@@ -912,7 +913,7 @@ public class UserSettings extends SettingsPreferenceFragment
if (mUserCaps.mDisallowAddUser) {
pref.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
} else if (mUserCaps.mDisallowSwitchUser) {
pref.setDisabledByAdmin(RestrictedLockUtils.getDeviceOwner(context));
pref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context));
} else {
pref.setDisabledByAdmin(null);
}
@@ -1090,7 +1091,7 @@ public class UserSettings extends SettingsPreferenceFragment
switch (v.getId()) {
case UserPreference.DELETE_ID:
final EnforcedAdmin removeDisallowedAdmin =
RestrictedLockUtils.checkIfRestrictionEnforced(getContext(),
RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getContext(),
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
if (removeDisallowedAdmin != null) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),

4
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -63,7 +63,7 @@ import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.widget.GearPreference;
import com.android.settings.widget.GearPreference.OnGearClickListener;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.collect.Lists;
@@ -143,7 +143,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements
// Disable all actions if VPN configuration has been disallowed
for (int i = 0; i < menu.size(); i++) {
if (isUiRestrictedByOnlyAdmin()) {
RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
RestrictedLockUtilsInternal.setMenuItemAsDisabledByAdmin(getPrefContext(),
menu.getItem(i), getRestrictionEnforcedAdmin());
} else {
menu.getItem(i).setEnabled(!mUnavailable);

3
src/com/android/settings/wifi/WifiDialog.java
View File

@@ -26,6 +26,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.wifi.AccessPoint;
public class WifiDialog extends AlertDialog implements WifiConfigUiBase,
@@ -117,7 +118,7 @@ public class WifiDialog extends AlertDialog implements WifiConfigUiBase,
case BUTTON_FORGET:
if (WifiUtils.isNetworkLockedDown(getContext(), mAccessPoint.getConfig())) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
RestrictedLockUtils.getDeviceOwner(getContext()));
RestrictedLockUtilsInternal.getDeviceOwner(getContext()));
return;
}
mListener.onForget(this);

8
src/com/android/settings/wifi/WifiEnabler.java
View File

@@ -35,8 +35,8 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.WirelessUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -162,12 +162,12 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene
mSwitchWidget.setEnabled(true);
}
if (RestrictedLockUtils.hasBaseUserRestriction(mContext,
if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId())) {
mSwitchWidget.setEnabled(false);
} else {
final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
mSwitchWidget.setDisabledByAdmin(admin);
}
}

3
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -67,6 +67,7 @@ import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settings.widget.SwitchBarController;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
@@ -578,7 +579,7 @@ public class WifiSettings extends RestrictedSettingsFragment
WifiConfiguration config = accessPoint.getConfig();
if (WifiUtils.isNetworkLockedDown(getActivity(), config) && accessPoint.isActive()) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
RestrictedLockUtils.getDeviceOwner(getActivity()));
RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
return;
}
}

3
src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
View File

@@ -35,6 +35,7 @@ import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.wifi.WifiConfigUiBase;
import com.android.settings.wifi.WifiDialog;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.wifi.AccessPoint;
@@ -108,7 +109,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment {
case Menu.FIRST:
if (!mWifiDetailPreferenceController.canModifyNetwork()) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
RestrictedLockUtils.getDeviceOwner(getContext()));
RestrictedLockUtilsInternal.getDeviceOwner(getContext()));
} else {
showDialog(WIFI_DIALOG_ID);
}