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

Commit 11ac8ac2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d65 am:... 

Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d65 am: 1a16975a am: b7077ab5

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

Change-Id: Icc629addf9f47a48a0da14d105d737a7e9e1348c
parents e4a1b74e b7077ab5

src/com/android/settings/nfc/PaymentDefaultDialog.java

+5 −1
Original line number Diff line number Diff line
@@ -58,7 +58,11 @@ public final class PaymentDefaultDialog extends AlertActivity implements 
        ComponentName component = intent.getParcelableExtra(

                CardEmulation.EXTRA_SERVICE_COMPONENT);

        String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY);

        int userId = intent.getIntExtra(CardEmulation.EXTRA_USERID, UserHandle.myUserId());

        UserHandle userHandle = intent.getParcelableExtra(Intent.EXTRA_USER);

        if (userHandle == null) {

            userHandle = UserHandle.CURRENT;

        }

        int userId = userHandle.getIdentifier();



        setResult(RESULT_CANCELED);

        if (!buildDialog(component, category, userId)) {