commit 1a16975a36f4fe4d1f1cd7a64881054fe7b83463
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 14 11:27:00 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 14 11:27:00 2022 +0000
tree 70a6bb18d855d5bbb57336ebfc43d3da0e8c97ad
parent 43b7ae19fbd8dd29acb3d02a2674d7498b051c27
parent 57238d653ca58019ce090ab1e4de14f421c74504

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

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

Change-Id: Icecb9f0232a86fbbaf8f8d9a22c86aaa40ab234d

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

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