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

Commit 45bd29c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct null UserHandle handling for ACTION_CHANGE_DEFAULT" into tm-dev am: 0469e3b5 

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

Change-Id: I2ac9a3f48928cb00f8a0674d489d2b5fd4eabc86
parents a1ec33b8 0469e3b5

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

+5 −2
Original line number Diff line number Diff line
@@ -59,10 +59,13 @@ public final class PaymentDefaultDialog extends AlertActivity implements 
                CardEmulation.EXTRA_SERVICE_COMPONENT);

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

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



        int userId;

        if (userHandle == null) {

            userHandle = UserHandle.CURRENT;

            userId = UserHandle.myUserId();

        } else {

            userId = userHandle.getIdentifier();

        }

        int userId = userHandle.getIdentifier();



        setResult(RESULT_CANCELED);

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