RestrictedLockUtils was split into ...Internal

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

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);
}