[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
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 1fb5f34..db68ba5f 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -68,6 +68,7 @@
":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 @@
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"],
+}
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 847edd1..2134704 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -11260,8 +11260,8 @@
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 {
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 1a33b768..8b5995a 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -37,7 +37,6 @@
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 @@
* <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 @@
* <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 @@
*/
@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 @@
* @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,
diff --git a/core/java/android/provider/flags.aconfig b/core/java/android/provider/flags.aconfig
new file mode 100644
index 0000000..3dd7692
--- /dev/null
+++ b/core/java/android/provider/flags.aconfig
@@ -0,0 +1,8 @@
+package: "android.provider"
+
+flag {
+ name: "system_settings_default"
+ namespace: "package_manager_service"
+ description: "Enable Settings.System.resetToDefault APIs."
+ bug: "279083734"
+}
