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