Merge "RestrictedLockUtils was split into ...Internal"

This commit is contained in:
Philip P. Moltmann
2018-08-31 04:47:28 +00:00
committed by Android (Google) Code Review
79 changed files with 358 additions and 274 deletions

View File

@@ -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());
}