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

Commit 75869c2e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change supervisor settings constants to int." into tm-dev am: 7f9d05c6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16979407

Change-Id: I33539a284336b821b924e1cc50abae6ba28b7438
parents 6e8b9e9d 7f9d05c6

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -35449,8 +35449,8 @@ package android.provider { 
    field public static final String EXTRA_WIFI_NETWORK_RESULT_LIST = "android.provider.extra.WIFI_NETWORK_RESULT_LIST";

    field public static final String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG";

    field public static final String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON";

    field public static final String SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = "supervisor_restricted_biometrics_controller";

    field public static final String SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = "";

    field public static final int SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = 1; // 0x1

    field public static final int SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = 0; // 0x0

  }















  public static final class Settings.Global extends android.provider.Settings.NameValueTable {

























core/java/android/provider/Settings.java



+4
−6




























Original line number
Diff line number
Diff line








@@ -24,7 +24,6 @@ import android.annotation.Nullable;













import android.annotation.RequiresPermission;















import android.annotation.SdkConstant;















import android.annotation.SdkConstant.SdkConstantType;













import android.annotation.StringDef;















import android.annotation.SuppressLint;















import android.annotation.SystemApi;















import android.annotation.TestApi;










@@ -2128,7 +2127,7 @@ public final class Settings {













    /**















     * Intent extra: The id of a setting restricted by supervisors.















     * <p>













     * Type: String with a value from the SupervisorVerificationSetting annotation below.













     * Type: Integer with a value from the SupervisorVerificationSetting annotation below.















     * <ul>















     * <li>{@link #SUPERVISOR_VERIFICATION_SETTING_UNKNOWN}















     * <li>{@link #SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS}









@@ -2141,20 +2140,19 @@ public final class Settings {













    /**















     * Unknown setting.















     */













    public static final String SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = "";













    public static final int SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = 0;





























    /**















     * Biometric settings for supervisors.















     */













    public static final String SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS =













            "supervisor_restricted_biometrics_controller";













    public static final int SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = 1;





























    /**















     * Keys for {@link #EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY}.















     * @hide















     */















    @Retention(RetentionPolicy.SOURCE)













    @StringDef(prefix = { "SUPERVISOR_VERIFICATION_SETTING_" }, value = {













    @IntDef(prefix = { "SUPERVISOR_VERIFICATION_SETTING_" }, value = {















            SUPERVISOR_VERIFICATION_SETTING_UNKNOWN,















            SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS,















    })

































packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -80,8 +80,8 @@ public class BiometricActionDisabledByAdminControllerTest {













        assertEquals(Settings.ACTION_MANAGE_SUPERVISOR_RESTRICTED_SETTING,















                intentCaptor.getValue().getAction());















        assertEquals(Settings.SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS,













                intentCaptor.getValue().getStringExtra(













                        Settings.EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY));













                intentCaptor.getValue().getIntExtra(













                        Settings.EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY, -1));















        assertEquals(componentName.getPackageName(), intentCaptor.getValue().getPackage());















    }















}