Merge "Add feature flags for Factory Reset Wizard." into main (9952d054) · Commits · e / os / android_packages_apps_Settings

Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -115,6 +115,7 @@ android_library {
	"androidx.room_room-runtime",		"androidx.room_room-runtime",
	"SystemUIUnfoldLib",		"SystemUIUnfoldLib",
	"aconfig_settings_flags_lib",		"aconfig_settings_flags_lib",
			"factory_reset_flags_lib",
	"android.content.pm.flags-aconfig-java",		"android.content.pm.flags-aconfig-java",
	"FingerprintManagerInteractor",		"FingerprintManagerInteractor",
	],		],

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ aconfig_declarations {
	"settings_connecteddevice_flag_declarations.aconfig",		"settings_connecteddevice_flag_declarations.aconfig",
	"settings_globalintl_flag_declarations.aconfig",		"settings_globalintl_flag_declarations.aconfig",
	"settings_apn_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: "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

0 → 100644

+8 −0

Original line number	Original line	Diff line number	Diff line
			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"
			}