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:
@@ -19,8 +19,8 @@ package com.android.settings.bluetooth;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
|
||||
/**
|
||||
* A utility class to aid testing.
|
||||
@@ -36,7 +36,7 @@ public class RestrictionUtils {
|
||||
* API.
|
||||
*/
|
||||
public EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) {
|
||||
return RestrictedLockUtils.checkIfRestrictionEnforced(
|
||||
return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
|
||||
context, restriction, UserHandle.myUserId());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user