Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0797323 authored by Rubin Xu's avatar Rubin Xu
Browse files

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
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: Ia810f67409ce2b482bca06f1e21df2f98d12ccfd
parent 5580360b

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6941,7 +6941,7 @@ package android.app.admin { 
    method public boolean isApplicationHidden(@NonNull android.content.ComponentName, String);

    method public boolean isBackupServiceEnabled(@NonNull android.content.ComponentName);

    method @Deprecated public boolean isCallerApplicationRestrictionsManagingPackage();

    method public boolean isCommonCriteriaModeEnabled(@NonNull android.content.ComponentName);

    method public boolean isCommonCriteriaModeEnabled(@Nullable android.content.ComponentName);

    method public boolean isDeviceIdAttestationSupported();

    method public boolean isDeviceOwnerApp(String);

    method public boolean isEphemeralUser(@NonNull android.content.ComponentName);

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -9349,7 +9349,6 @@ package android.provider { 
    field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";

    field public static final String CARRIER_APP_NAMES = "carrier_app_names";

    field public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";

    field public static final String COMMON_CRITERIA_MODE = "common_criteria_mode";

    field public static final String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";

    field public static final String DEVICE_DEMO_MODE = "device_demo_mode";

    field public static final String DEVICE_PROVISIONING_MOBILE_DATA_ENABLED = "device_provisioning_mobile_data";

core/java/android/app/admin/DevicePolicyManager.java

+9 −5
Original line number Diff line number Diff line
@@ -11886,13 +11886,17 @@ public class DevicePolicyManager { 
    }















    /**













     * Called by device owner or profile owner of an organization-owned managed profile to return













     * whether Common Criteria mode is currently enabled for the device.













     *













     * @param admin which {@link DeviceAdminReceiver} this request is associated with.













     * Returns whether Common Criteria mode is currently enabled. Device owner and profile owner of













     * an organization-owned managed profile can query its own Common Criteria mode setting by













     * calling this method with its admin {@link ComponentName}. Any caller can obtain the













     * aggregated device-wide Common Criteria mode state by passing {@code null} as the













     * {@code admin} argument.













     *













     * @param admin which {@link DeviceAdminReceiver} this request is associated with, or













     *     {@code null} if the caller is not a device admin.















     * @return {@code true} if Common Criteria mode is enabled, {@code false} otherwise.















     */













    public boolean isCommonCriteriaModeEnabled(@NonNull ComponentName admin) {













    public boolean isCommonCriteriaModeEnabled(@Nullable ComponentName admin) {















        throwIfParentInstance("isCommonCriteriaModeEnabled");















        if (mService != null) {















            try {

























core/java/android/provider/Settings.java



+0
−13






























Original line number
Diff line number
Diff line








@@ -14197,19 +14197,6 @@ public final class Settings {













        public static final String POWER_BUTTON_SUPPRESSION_DELAY_AFTER_GESTURE_WAKE =















                "power_button_suppression_delay_after_gesture_wake";



























        /**













         * An integer indicating whether the device is in Common Criteria mode. When enabled,













         * certain device functionalities are tuned to meet the higher security level required













         * by Common Criteria certification. Examples include:













         *   Bluetooth long term key material is additionally integrity-protected with AES-GCM.













         *   WiFi configuration store is additionally integrity-protected with AES-GCM.













         * A value of 0 means Common Criteria mode is not enabled (default), a value of non-zero













         * means Common Criteria mode is enabled.













         * @hide













         */













        @SystemApi













        public static final String COMMON_CRITERIA_MODE = "common_criteria_mode";



























        /**















         * The usage amount of advanced battery. The value is 0~100.















         *

























packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1






























Original line number
Diff line number
Diff line








@@ -199,7 +199,6 @@ public class SettingsBackupTest {













                    Settings.Global.CERT_PIN_UPDATE_CONTENT_URL,















                    Settings.Global.CERT_PIN_UPDATE_METADATA_URL,















                    Settings.Global.COMPATIBILITY_MODE,













                    Settings.Global.COMMON_CRITERIA_MODE,















                    Settings.Global.CONNECTIVITY_CHANGE_DELAY,















                    Settings.Global.CONNECTIVITY_METRICS_BUFFER_SIZE,















                    Settings.Global.CONNECTIVITY_SAMPLING_INTERVAL_IN_SECONDS,