From 8d4d286d8f597edbd74619b2328b7843cd3d53f9 Mon Sep 17 00:00:00 2001 From: Omer Ozer Date: Tue, 26 Sep 2023 16:37:32 +0000 Subject: [PATCH] Add feature flags for Factory Reset Wizard. Bug: 301283840 Test: Manual Change-Id: I1e0d71003fe8a5fe93de6ee5a8c725b5abafb048 --- Android.bp | 1 + aconfig/Android.bp | 12 +++++++++++- .../factory_reset_flag_declarations.aconfig | 8 ++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 aconfig/factory_reset/factory_reset_flag_declarations.aconfig diff --git a/Android.bp b/Android.bp index a62aa1101c0..8c50ed56ec8 100644 --- a/Android.bp +++ b/Android.bp @@ -115,6 +115,7 @@ android_library { "androidx.room_room-runtime", "SystemUIUnfoldLib", "aconfig_settings_flags_lib", + "factory_reset_flags_lib", "android.content.pm.flags-aconfig-java", "FingerprintManagerInteractor", ], diff --git a/aconfig/Android.bp b/aconfig/Android.bp index d0a8afef9e9..7828e995840 100644 --- a/aconfig/Android.bp +++ b/aconfig/Android.bp @@ -9,7 +9,7 @@ aconfig_declarations { "settings_connecteddevice_flag_declarations.aconfig", "settings_globalintl_flag_declarations.aconfig", "settings_apn_flag_declarations.aconfig", - "settings_onboarding_experience_flag_declarations.aconfig" + "settings_onboarding_experience_flag_declarations.aconfig", ], } @@ -18,3 +18,13 @@ java_aconfig_library { aconfig_declarations: "aconfig_settings_flags", } +aconfig_declarations { + name: "factory_reset_flags", + package: "com.android.settings.factory_reset", + srcs: ["factory_reset/*.aconfig"], +} + +java_aconfig_library { + name: "factory_reset_flags_lib", + aconfig_declarations: "factory_reset_flags", +} \ No newline at end of file diff --git a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig new file mode 100644 index 00000000000..2b1ce720003 --- /dev/null +++ b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig @@ -0,0 +1,8 @@ +package: "com.android.settings.factory_reset" + +flag { + name: "enable_factory_reset_wizard" + namespace: "wallet_integration" + description: "Gates whether to enable factory reset wizard." + bug: "301283840" +}