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

Commit b1922e64 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Protect slice permissions text" into pi-dev 

am: e791b674

Change-Id: If65f285e9525b9f5b5212e3fede65ef4d378c312
parents d96b5ed1 e791b674

packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.NameNotFoundException;

import android.net.Uri;

import android.net.Uri;

import android.os.Bundle;

import android.os.Bundle;

import android.text.BidiFormatter;

import android.util.Log;

import android.util.Log;

import android.widget.CheckBox;

import android.widget.CheckBox;

import android.widget.TextView;

import android.widget.TextView;
@@ -50,8 +51,10 @@ public class SlicePermissionActivity extends Activity implements OnClickListener 




        try {

        try {

            PackageManager pm = getPackageManager();

            PackageManager pm = getPackageManager();

            CharSequence app1 = pm.getApplicationInfo(mCallingPkg, 0).loadLabel(pm);

            CharSequence app1 = BidiFormatter.getInstance().unicodeWrap(

            CharSequence app2 = pm.getApplicationInfo(mProviderPkg, 0).loadLabel(pm);

                    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)

            AlertDialog dialog = new AlertDialog.Builder(this)

                    .setTitle(getString(R.string.slice_permission_title, app1, app2))

                    .setTitle(getString(R.string.slice_permission_title, app1, app2))

                    .setView(R.layout.slice_permission_request)

                    .setView(R.layout.slice_permission_request)