Merge cherrypicks of [4586293, 4586294, 4586295, 4584365, 4584366, 4584367, 4584368, 4584369, 4584370, 4587544, 4584705, 4586296, 4587545, 4587546, 4586297, 4586298, 4586299, 4586300, 4584371, 4586301, 4584706, 4586302, 4586303, 4587584, 4587585, 4587586, 4587587, 4587588, 4587589, 4587590, 4587591, 4587644, 4587645, 4587646, 4587647, 4587648, 4587649, 4587650, 4587651, 4587652, 4587653, 4587654, 4587655, 4587656, 4587657, 4587658, 4587659, 4587660, 4587661, 4587662, 4584536, 4587547, 4587548, 4587549, 4584707, 4584708, 4587550, 4587551, 4587593, 4586516, 4584372, 4584373, 4584374, 4587595, 4584375, 4584376, 4587552, 4587596, 4587597, 4587598, 4587599, 4584414, 4584415, 4584416, 4584417, 4584418, 4584419, 4584420, 4584421, 4584422, 4584423, 4587804, 4587805, 4587806, 4587807, 4587808, 4587809, 4587810, 4587811, 4587812, 4587813, 4587814, 4587815, 4587816, 4587817, 4587818, 4587884, 4587885, 4587600, 4587601, 4587819, 4584709] into sparse-4749909-L91900000192339903

Change-Id: I15045ec3c1dd75219474205c03a53fddd6684f9c

3 files changed, 5 insertions, 6 deletions

diff --git a/src/com/android/packageinstaller/UninstallerActivity.java b/src/com/android/packageinstaller/UninstallerActivity.java
index dbd7ac3d..142e95e6 100755
--- a/src/com/android/packageinstaller/UninstallerActivity.java
+++ b/src/com/android/packageinstaller/UninstallerActivity.java
@@ -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);
diff --git a/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java b/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java
index 417b75a2..b50960e4 100644
--- a/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java
+++ b/src/com/android/packageinstaller/handheld/UninstallAlertDialogFragment.java
@@ -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));
diff --git a/src/com/android/packageinstaller/television/UninstallAlertFragment.java b/src/com/android/packageinstaller/television/UninstallAlertFragment.java
index c1281749..138a5c36 100644
--- a/src/com/android/packageinstaller/television/UninstallAlertFragment.java
+++ b/src/com/android/packageinstaller/television/UninstallAlertFragment.java
@@ -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));