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

Commit ee2536f3 authored by SongFerngWang's avatar SongFerngWang Committed by Automerger Merge Worker
Browse files

The settings crash when it add the RTL mark on MEP message am: 7de5f998 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929



Change-Id: I9c2f7b7388b9281a5a90cd11155cbac14b950aef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d728de8 7de5f998

src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java

+1 −4
Original line number Diff line number Diff line
@@ -460,13 +460,10 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc 
        switchDialogMsg.append(

                getString(R.string.sim_action_switch_sub_dialog_mep_text, displayName));

        if (isRtlMode) {

            /* There are two lines of message in the dialog, and the RTL symbols must be added

             * before and after each sentence, so use the line break symbol to find the position.

            /* The RTL symbols must be added before and after each sentence.

             * (Each message are all with two line break symbols)

             */

            switchDialogMsg.insert(0, RTL_MARK)

                    .insert(switchDialogMsg.indexOf(LINE_BREAK) - LINE_BREAK_OFFSET_ONE, RTL_MARK)

                    .insert(switchDialogMsg.indexOf(LINE_BREAK) + LINE_BREAK_OFFSET_TWO, RTL_MARK)

                    .insert(switchDialogMsg.length(), RTL_MARK);

        }

        ConfirmDialogFragment.show(