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