diff options
| author | Rubin Xu <rubinxu@google.com> | 2020-03-10 14:58:48 +0000 |
|---|---|---|
| committer | Rubin Xu <rubinxu@google.com> | 2020-03-10 14:58:48 +0000 |
| commit | d86af22742bc00f5f8ecb6d0076a25be46586cf9 (patch) | |
| tree | 739d96c355e125dc949fed3f5e046cb2950c3d9b /service | |
| parent | 87aca9ea9950cb34833559cd84cee28c3e3f84e3 (diff) | |
Replace COMMON_CRITERIA_MODE setting with getter API
Per API review feedback, global settings are discouraged in favour
of fine-grained getter APIs.
Bug: 149999040
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testCommonCriteriaMode
Test: atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testCommonCriteriaMode
Change-Id: Ia9b0f1af4d104cd99fd9993bc6806ee3c607bc37
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/FrameworkFacade.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/FrameworkFacade.java b/service/java/com/android/server/wifi/FrameworkFacade.java index 20c27d70b..0262cc32b 100644 --- a/service/java/com/android/server/wifi/FrameworkFacade.java +++ b/service/java/com/android/server/wifi/FrameworkFacade.java @@ -22,6 +22,7 @@ import android.app.ActivityManager; import android.app.AlertDialog; import android.app.Notification; import android.app.PendingIntent; +import android.app.admin.DevicePolicyManager; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -121,7 +122,8 @@ public class FrameworkFacade { * Returns whether the device is in NIAP mode or not. */ public boolean isNiapModeOn(Context context) { - return getIntegerSetting(context, Settings.Global.COMMON_CRITERIA_MODE, 0) == 1; + return context.getSystemService(DevicePolicyManager.class) + .isCommonCriteriaModeEnabled(null); } /** |