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

Commit 2e3d3cd8 authored by Songchun Fan's avatar Songchun Fan
Browse files

[SettingsProvider] add missing @FlaggedAPI annotations 

These new APIs were added in June (ag/23836710) before the flag system
was enabled.

BUG: 304478650
Test: builds

Change-Id: I90715ecf82c3010bb99c7d01a2d9fe56158fbbd0
parent f0d16342

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ aconfig_srcjars = [ 
    ":android.tracing.flags-aconfig-java{.generated_srcjars}",

    ":android.appwidget.flags-aconfig-java{.generated_srcjars}",

    ":android.webkit.flags-aconfig-java{.generated_srcjars}",

    ":android.provider.flags-aconfig-java{.generated_srcjars}",

]



filegroup {
@@ -845,3 +846,16 @@ java_aconfig_library { 
    aconfig_declarations: "android.webkit.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Provider

aconfig_declarations {

    name: "android.provider.flags-aconfig",

    package: "android.provider",

    srcs: ["core/java/android/provider/*.aconfig"],

}



java_aconfig_library {

    name: "android.provider.flags-aconfig-java",

    aconfig_declarations: "android.provider.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -11260,8 +11260,8 @@ package android.provider { 














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















    method @RequiresPermission(android.Manifest.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE) public static boolean putString(@NonNull android.content.ContentResolver, @NonNull String, @Nullable String, boolean);













    method @RequiresPermission(android.Manifest.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE) public static boolean putString(@NonNull android.content.ContentResolver, @NonNull String, @Nullable String, boolean, boolean);













    method public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);













    method @FlaggedApi("android.provider.system_settings_default") @RequiresPermission(android.Manifest.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE) public static boolean putString(@NonNull android.content.ContentResolver, @NonNull String, @Nullable String, boolean, boolean);













    method @FlaggedApi("android.provider.system_settings_default") public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);















  }





























  public static final class SimPhonebookContract.SimRecords {

























core/java/android/provider/Settings.java



+4
−3




























Original line number
Diff line number
Diff line








@@ -37,7 +37,6 @@ import android.app.ActivityThread;













import android.app.AppOpsManager;















import android.app.Application;















import android.app.AutomaticZenRule;













import android.app.Flags;















import android.app.NotificationChannel;















import android.app.NotificationManager;















import android.app.SearchManager;










@@ -1921,7 +1920,7 @@ public final class Settings {













     * <p>















     * Output: Nothing.















     */













    @FlaggedApi(Flags.FLAG_MODES_API)













    @FlaggedApi(android.app.Flags.FLAG_MODES_API)















    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)















    public static final String ACTION_AUTOMATIC_ZEN_RULE_SETTINGS















            = "android.settings.AUTOMATIC_ZEN_RULE_SETTINGS";









@@ -1931,7 +1930,7 @@ public final class Settings {













     * <p>















     * This must be passed as an extra field to the {@link #ACTION_AUTOMATIC_ZEN_RULE_SETTINGS}.















     */













    @FlaggedApi(Flags.FLAG_MODES_API)













    @FlaggedApi(android.app.Flags.FLAG_MODES_API)















    public static final String EXTRA_AUTOMATIC_ZEN_RULE_ID















            = "android.provider.extra.AUTOMATIC_ZEN_RULE_ID";
























@@ -4086,6 +4085,7 @@ public final class Settings {













         */















        @RequiresPermission(Manifest.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE)















        @SystemApi













        @FlaggedApi(Flags.FLAG_SYSTEM_SETTINGS_DEFAULT)















        public static boolean putString(@NonNull ContentResolver resolver, @NonNull String name,















                @Nullable String value, boolean makeDefault, boolean overrideableByRestore) {















            return putStringForUser(resolver, name, value, /* tag= */ null,










@@ -4140,6 +4140,7 @@ public final class Settings {













         * @hide















         */















        @SystemApi













        @FlaggedApi(Flags.FLAG_SYSTEM_SETTINGS_DEFAULT)















        public static void resetToDefaults(@NonNull ContentResolver resolver,















                @Nullable String tag) {















            resetToDefaultsAsUser(resolver, tag, RESET_MODE_PACKAGE_DEFAULTS,

































core/java/android/provider/flags.aconfig
0 → 100644



+8
−0




























Original line number
Diff line number
Diff line













package: "android.provider"



























flag {













    name: "system_settings_default"













    namespace: "package_manager_service"













    description: "Enable Settings.System.resetToDefault APIs."













    bug: "279083734"













}