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

Commit c8ae220e authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Expose hidden constant."

parents c4946d4a e886405d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32924,6 +32924,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";

    field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";

    field public static final java.lang.String ACTION_ZEN_MODE_PRIORITY_SETTINGS = "android.settings.ZEN_MODE_PRIORITY_SETTINGS";

    field public static final java.lang.String AUTHORITY = "settings";

    field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";

    field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35732,6 +35732,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_WIFI_SAVED_NETWORK_SETTINGS = "android.settings.WIFI_SAVED_NETWORK_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";

    field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";

    field public static final java.lang.String ACTION_ZEN_MODE_PRIORITY_SETTINGS = "android.settings.ZEN_MODE_PRIORITY_SETTINGS";

    field public static final java.lang.String AUTHORITY = "settings";

    field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";

    field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33038,6 +33038,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";

    field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";

    field public static final java.lang.String ACTION_ZEN_MODE_PRIORITY_SETTINGS = "android.settings.ZEN_MODE_PRIORITY_SETTINGS";

    field public static final java.lang.String AUTHORITY = "settings";

    field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";

    field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";

core/java/android/provider/Settings.java

+0 −2
Original line number Diff line number Diff line
@@ -1072,8 +1072,6 @@ public final class Settings { 


    /**

     * Activity Action: Show Zen Mode priority configuration settings.

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_ZEN_MODE_PRIORITY_SETTINGS