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:
@@ -28,7 +28,7 @@ import android.widget.ImageView;
|
||||
import androidx.preference.PreferenceViewHolder;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
import java.util.Comparator;
|
||||
@@ -142,7 +142,7 @@ public class UserPreference extends RestrictedPreference {
|
||||
|
||||
private boolean canDeleteUser() {
|
||||
return mDeleteClickListener != null
|
||||
&& !RestrictedLockUtils.hasBaseUserRestriction(getContext(),
|
||||
&& !RestrictedLockUtilsInternal.hasBaseUserRestriction(getContext(),
|
||||
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user