diff options
| author | Rubin Xu <rubinxu@google.com> | 2020-03-18 18:42:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-18 18:42:27 +0000 |
| commit | b86e5186704327ec89a7cea5aa56f1594aff791c (patch) | |
| tree | ba5492b68c1b6f5c4110fdf59e71e07670a9d12d /service | |
| parent | d36cf04e2fc563ac2d0039d7595b54fa35a26b97 (diff) | |
| parent | d86af22742bc00f5f8ecb6d0076a25be46586cf9 (diff) | |
Merge "Replace COMMON_CRITERIA_MODE setting with getter API" into rvc-dev
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); } /** |