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

Commit f59abc3d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose SYSTEM_UPGRADE_SETTINGS as a public API" into main

parents 8aca6ab5 98f3d8bc

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38723,6 +38723,7 @@ package android.provider { 
    field public static final String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";

    field @Deprecated public static final String ACTION_STORAGE_VOLUME_ACCESS_SETTINGS = "android.settings.STORAGE_VOLUME_ACCESS_SETTINGS";

    field public static final String ACTION_SYNC_SETTINGS = "android.settings.SYNC_SETTINGS";

    field @FlaggedApi("android.provider.expose_system_update_settings") public static final String ACTION_SYSTEM_UPDATE_SETTINGS = "android.settings.SYSTEM_UPDATE_SETTINGS";

    field @FlaggedApi("android.provider.system_regional_preferences_api_enabled") public static final String ACTION_TEMPERATURE_UNIT_SETTINGS = "android.settings.TEMPERATURE_UNIT_SETTINGS";

    field public static final String ACTION_USAGE_ACCESS_SETTINGS = "android.settings.USAGE_ACCESS_SETTINGS";

    field public static final String ACTION_USER_DICTIONARY_SETTINGS = "android.settings.USER_DICTIONARY_SETTINGS";

core/java/android/provider/Settings.java

+12 −1
Original line number Diff line number Diff line
@@ -1733,8 +1733,19 @@ public final class Settings { 
     * <p>

     * Output: Nothing.

     *

     * @hide

     * <p>To prevent interception by third-party applications, system settings apps should implement

     * the system update functionality that must set a priority higher than default value (0).

     * Example:

     *

     * <pre>{@code

     * <Activity android:name=".MySystemUpdate">

     *     <intent-filter android:priority="1">

     *         <action android:name="android.settings.SYSTEM_UPDATE_SETTINGS" />

     *     </intent-filter>

     * </Activity>

     * }</pre>

     */

    @FlaggedApi(Flags.FLAG_EXPOSE_SYSTEM_UPDATE_SETTINGS)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_SYSTEM_UPDATE_SETTINGS =

            "android.settings.SYSTEM_UPDATE_SETTINGS";

core/java/android/provider/flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -78,3 +78,12 @@ flag { 
    description: "This flag will enable documents trash APIs"

    bug: "409260986"

}



# OWNER=rambowang TARGET=25Q4

flag {

    name: "expose_system_update_settings"

    is_exported: true

    namespace: "android_settings"

    description: "Feature flag to expose SYSTEM_UPDATE_SETTINGS as a public API"

    bug: "417458670"

}