Merge "Flag removal: AvatarSync" into main (019aff49) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/multiuser.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -75,14 +75,6 @@ flag {
		bug: "303201022"
		}

		flag {
		name: "avatar_sync"
		namespace: "multiuser"
		description: "Implement new Avatar Picker outside of SetttingsLib with ability to select avatars from Google Account and synchronise to any changes."
		bug: "296829976"
		is_fixed_read_only: true
		}

		flag {
		name: "allow_resolver_sheet_for_private_space"
		namespace: "profile_experiences"

+7 −13

Original line number	Diff line number	Diff line
		@@ -131,7 +131,6 @@ public class EditUserPhotoController {
		private void showAvatarPicker(boolean isUserNew) {
		Intent intent = new Intent(AVATAR_PICKER_ACTION);
		intent.addCategory(Intent.CATEGORY_DEFAULT);
		if (Flags.avatarSync()) {
		intent.putExtra(EXTRA_IS_USER_NEW, isUserNew);
		// Fix vulnerability b/341688848 by explicitly set the class name of avatar picker.
		if (Flags.fixAvatarCrossUserLeak()) {
		@@ -140,11 +139,6 @@ public class EditUserPhotoController {
		final String className = mActivity.getString(R.string.config_avatar_picker_class);
		intent.setClassName(packageName, className);
		}
		} else {
		// SettingsLib is used by multiple apps therefore we need to know out of all apps
		// using settingsLib which one is the one we return value to.
		intent.setPackage(mImageView.getContext().getApplicationContext().getPackageName());
		}
		intent.putExtra(EXTRA_FILE_AUTHORITY, mFileAuthority);
		mActivityStarter.startActivityForResult(intent, REQUEST_CODE_PICK_AVATAR);
		}