From 3cc74c55b2c0e65ec6444dccfee8c2324cd7194c Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Mon, 9 Apr 2018 08:10:59 -0400 Subject: Protect slice permissions text Bug: 72749457 Change-Id: I4c1820b2696b61d51f9a3d500b16b4c323fa731f --- .../SystemUI/src/com/android/systemui/SlicePermissionActivity.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java b/packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java index 302face14c1a..56cb88870d65 100644 --- a/packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java @@ -25,6 +25,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.net.Uri; import android.os.Bundle; +import android.text.BidiFormatter; import android.util.Log; import android.widget.CheckBox; import android.widget.TextView; @@ -50,8 +51,10 @@ public class SlicePermissionActivity extends Activity implements OnClickListener try { PackageManager pm = getPackageManager(); - CharSequence app1 = pm.getApplicationInfo(mCallingPkg, 0).loadLabel(pm); - CharSequence app2 = pm.getApplicationInfo(mProviderPkg, 0).loadLabel(pm); + CharSequence app1 = BidiFormatter.getInstance().unicodeWrap( + pm.getApplicationInfo(mCallingPkg, 0).loadSafeLabel(pm).toString()); + CharSequence app2 = BidiFormatter.getInstance().unicodeWrap( + pm.getApplicationInfo(mProviderPkg, 0).loadSafeLabel(pm).toString()); AlertDialog dialog = new AlertDialog.Builder(this) .setTitle(getString(R.string.slice_permission_title, app1, app2)) .setView(R.layout.slice_permission_request) -- cgit v1.2.3-59-g8ed1b