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

Commit 000630dd authored by Atanas Kirilov's avatar Atanas Kirilov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-6ebe6f88-baa6-4992-847e-cbad0be1c6a5" into cw-f-dev 

* changes:
  [automerger] RESTRICT AUTOMERGE: Always use safe labels am: 25e686d3 am: 335c7116 am: 5641c2aa
  [automerger] RESTRICT AUTOMERGE: Always use safe labels am: 25e686d3 am: 335c7116
  [automerger] RESTRICT AUTOMERGE: Always use safe labels am: 25e686d3
  RESTRICT AUTOMERGE: Always use safe labels
parents 33b72899 f83c1ed8

src/com/android/packageinstaller/UninstallerActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class UninstallerActivity extends Activity { 
        public Dialog onCreateDialog(Bundle savedInstanceState) {

            final PackageManager pm = getActivity().getPackageManager();

            final DialogInfo dialogInfo = ((UninstallerActivity) getActivity()).mDialogInfo;

            final CharSequence appLabel = dialogInfo.appInfo.loadLabel(pm);

            final CharSequence appLabel = dialogInfo.appInfo.loadSafeLabel(pm);



            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity());

            StringBuilder messageBuilder = new StringBuilder();
@@ -64,7 +64,7 @@ public class UninstallerActivity extends Activity { 
            // If the Activity label differs from the App label, then make sure the user

            // knows the Activity belongs to the App being uninstalled.

            if (dialogInfo.activityInfo != null) {

                final CharSequence activityLabel = dialogInfo.activityInfo.loadLabel(pm);

                final CharSequence activityLabel = dialogInfo.activityInfo.loadSafeLabel(pm);

                if (!activityLabel.equals(appLabel)) {

                    messageBuilder.append(

                            getString(R.string.uninstall_activity_text, activityLabel));