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

Commit 2b4d662a authored by Anna Bauza's avatar Anna Bauza Committed by Android Build Coastguard Worker
Browse files

Remove flag fixAvatarCrossUserLeak 

Remove flag since this is a security fix and missing the flag on security branch is causing build failure.

Bug: 341688848
Test: N/A
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2ab1084a748a2303289624e6063d2c60d10ec922)
Merged-In: I7d92e0bdb750a5e0a81e9bfd03ea50686c82f6e0
Change-Id: I7d92e0bdb750a5e0a81e9bfd03ea50686c82f6e0
parent 8cba0e8b

packages/SettingsLib/src/com/android/settingslib/users/EditUserPhotoController.java

+4 −6
Original line number Diff line number Diff line
@@ -134,12 +134,10 @@ public class EditUserPhotoController { 
        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()) {

            final String packageName =

                    mActivity.getString(R.string.config_avatar_picker_package);

            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.