Merge tag 'android-8.1.0_r43' into staging/lineage-15.1_merge-android-8.1.0_r43

Android 8.1.0 release 43

* tag 'android-8.1.0_r43':
  RESTRICT AUTOMERGE: Always use safe labels

Change-Id: I265d7d1c5e86e8b2a96e8d60856673a91e874bba

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