diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java index 75746ce94d2..d333b3da6ac 100644 --- a/src/com/android/settings/nfc/PaymentDefaultDialog.java +++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java @@ -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)) {