diff options
| author | 2023-12-13 10:44:31 +0000 | |
|---|---|---|
| committer | 2023-12-13 10:44:31 +0000 | |
| commit | 53d81cb3c4a89f4d7f74669629030c5499169f9f (patch) | |
| tree | 4666722aae722422a812a160bb9c0307373ebdd8 | |
| parent | 4ddec7a616f4812bd03cbaca9721b1d5519e3239 (diff) | |
| parent | 5340f7a4fbcd7f470434beb01ac8eefde08c2a68 (diff) | |
Merge "Do not pass parameter to strings which are not expecting it" into main
| -rw-r--r-- | packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java b/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java index e07e9425808e..2da8c8c69ff8 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java @@ -156,10 +156,9 @@ public class UninstallAlertDialogFragment extends DialogFragment implements if (customUserManager.isUserOfType(USER_TYPE_PROFILE_MANAGED) && customUserManager.isSameProfileGroup(dialogInfo.user, myUserHandle)) { messageBuilder.append(isArchive - ? getString(R.string.archive_application_text_current_user_work_profile, - userName) : getString( - R.string.uninstall_application_text_current_user_work_profile, - userName)); + ? getString(R.string.archive_application_text_current_user_work_profile) + : getString( + R.string.uninstall_application_text_current_user_work_profile)); } else if (customUserManager.isUserOfType(USER_TYPE_PROFILE_CLONE) && customUserManager.isSameProfileGroup(dialogInfo.user, myUserHandle)) { mIsClonedApp = true; @@ -168,11 +167,11 @@ public class UninstallAlertDialogFragment extends DialogFragment implements } else if (Flags.allowPrivateProfile() && customUserManager.isPrivateProfile() && customUserManager.isSameProfileGroup(dialogInfo.user, myUserHandle)) { - messageBuilder.append(isArchive ? getString( - R.string.archive_application_text_current_user_private_profile, - userName) : getString( - R.string.uninstall_application_text_current_user_private_profile, - userName)); + messageBuilder.append( + isArchive ? getString( + R.string.archive_application_text_current_user_private_profile) + : getString( + R.string.uninstall_application_text_current_user_private_profile)); } else if (isArchive) { messageBuilder.append( getString(R.string.archive_application_text_user, userName)); |