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

Commit af0d8f74 authored by Atanas Kirilov's avatar Atanas Kirilov Committed by android-build-merger
Browse files

Merge "RESTRICT AUTOMERGE: Always use safe labels" into oc-dev 

am: de433776

Change-Id: Ib024b03ce210171f63d497cf8bdf8ff7b705ec31
parents 730a8e1c de433776

src/com/android/packageinstaller/UninstallerActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public class UninstallerActivity extends Activity { 


    public void startUninstallProgress() {

        boolean returnResult = getIntent().getBooleanExtra(Intent.EXTRA_RETURN_RESULT, false);

        CharSequence label = mDialogInfo.appInfo.loadLabel(getPackageManager());

        CharSequence label = mDialogInfo.appInfo.loadSafeLabel(getPackageManager());



        if (isTv()) {

            Intent newIntent = new Intent(Intent.ACTION_VIEW);

src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java

+2 −3
Original line number Diff line number Diff line
@@ -37,15 +37,14 @@ public class UninstallAlertDialogFragment extends DialogFragment implements 
        final PackageManager pm = getActivity().getPackageManager();

        final UninstallerActivity.DialogInfo dialogInfo =

                ((UninstallerActivity) getActivity()).getDialogInfo();

        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();



        // 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));

src/com/android/packageinstaller/television/UninstallAlertFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -42,14 +42,14 @@ public class UninstallAlertFragment extends GuidedStepFragment { 
        final PackageManager pm = getActivity().getPackageManager();

        final UninstallerActivity.DialogInfo dialogInfo =

                ((UninstallerActivity) getActivity()).getDialogInfo();

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

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



        StringBuilder messageBuilder = new StringBuilder();



        // 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));