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

Commit d7852019 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix BiDi issues in app error dialogs" into nyc-dev

parents 569edb85 890f1f37

services/core/java/com/android/server/am/AppErrorDialog.java

+6 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.res.Resources; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.text.BidiFormatter;

import android.util.Slog;

import android.view.LayoutInflater;

import android.view.View;
@@ -68,18 +69,21 @@ final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListen 
        mProc = data.proc;

        mResult = data.result;

        mRepeating = data.repeating;

        BidiFormatter bidi = BidiFormatter.getInstance();



        if ((mProc.pkgList.size() == 1) &&

                (mName = context.getPackageManager().getApplicationLabel(mProc.info)) != null) {

            setTitle(res.getString(

                    mRepeating ? com.android.internal.R.string.aerr_application_repeated

                            : com.android.internal.R.string.aerr_application,

                    mName.toString(), mProc.info.processName));

                    bidi.unicodeWrap(mName.toString()),

                    bidi.unicodeWrap(mProc.info.processName)));

        } else {

            mName = mProc.processName;

            setTitle(res.getString(

                    mRepeating ? com.android.internal.R.string.aerr_process_repeated

                            : com.android.internal.R.string.aerr_process,

                    mName.toString()));

                    bidi.unicodeWrap(mName.toString())));

        }



        setCancelable(false);

services/core/java/com/android/server/am/AppNotRespondingDialog.java

+5 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.res.Resources; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.text.BidiFormatter;

import android.util.Slog;

import android.view.LayoutInflater;

import android.view.View;
@@ -84,9 +85,11 @@ final class AppNotRespondingDialog extends BaseErrorDialog implements View.OnCli 
            }

        }



        BidiFormatter bidi = BidiFormatter.getInstance();



        setTitle(name2 != null

                ? res.getString(resid, name1.toString(), name2.toString())

                : res.getString(resid, name1.toString()));

                ? res.getString(resid, bidi.unicodeWrap(name1.toString()), bidi.unicodeWrap(name2.toString()))

                : res.getString(resid, bidi.unicodeWrap(name1.toString())));



        if (aboveSystem) {

            getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);