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