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

Commit 369820e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "UiccSlot: Validate hotswap restart prompt component properly" am: 8f565e31 am: 8ca27d3a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2045387



Change-Id: Ib1667add720161c9d2bbc9d38ab642470442ea35
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 500caf66 8ca27d3a

src/java/com/android/internal/telephony/uicc/UiccSlot.java

+4 −4
Original line number Diff line number Diff line
@@ -412,11 +412,11 @@ public class UiccSlot extends Handler { 
    private void promptForRestart(boolean isAdded) {

        synchronized (mLock) {

            final Resources res = mContext.getResources();

            final String dialogComponent = res.getString(

                    R.string.config_iccHotswapPromptForRestartDialogComponent);

            final ComponentName dialogComponent = ComponentName.unflattenFromString(

                    res.getString(R.string.config_iccHotswapPromptForRestartDialogComponent));

            if (dialogComponent != null) {

                Intent intent = new Intent().setComponent(ComponentName.unflattenFromString(

                        dialogComponent)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

                Intent intent = new Intent().setComponent(dialogComponent)

                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

                        .putExtra(EXTRA_ICC_CARD_ADDED, isAdded);

                try {

                    mContext.startActivityAsUser(intent, UserHandle.CURRENT);