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,6 +56,7 @@ import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settings.search.Indexable;
|
||||
import com.android.settings.search.SearchIndexableRaw;
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
|
||||
import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
|
||||
import com.android.settingslib.search.SearchIndexable;
|
||||
@@ -460,10 +461,11 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
|
||||
* @return {@code true} iff a intent was shown.
|
||||
*/
|
||||
private boolean wasAdminSupportIntentShown(@NonNull String restriction) {
|
||||
EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
|
||||
getActivity(), restriction, UserHandle.myUserId());
|
||||
EnforcedAdmin admin = RestrictedLockUtilsInternal
|
||||
.checkIfRestrictionEnforced(getActivity(), restriction,
|
||||
UserHandle.myUserId());
|
||||
boolean hasBaseUserRestriction =
|
||||
RestrictedLockUtils.hasBaseUserRestriction(
|
||||
RestrictedLockUtilsInternal.hasBaseUserRestriction(
|
||||
getActivity(), restriction, UserHandle.myUserId());
|
||||
if (admin != null && !hasBaseUserRestriction) {
|
||||
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
|
||||
|
Reference in New Issue
Block a user