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:
@@ -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 =
|
||||
|
Reference in New Issue
Block a user