commit c7b568751eed4e9f8f4056848e8894c6abb2860f
author Jack Yu <jackcwyu@google.com> Wed Feb 09 21:34:59 2022 +0800
committer Jack Yu <jackcwyu@google.com> Wed Feb 09 21:34:59 2022 +0800
tree cdb0b9d391d7225058d95285e30e7f0d2a24295a
parent e299e3758522cf0d8dd37a3c91f2486fe849ce30

Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT

Use Intent.EXTRA_USER to pass the UserHandle as the extra field of
ACTION_CHANGE_DEFAULT.

Bug: 215300017
Test: manual
Change-Id: I8862ae509638c7c264f49c4bc5753a65e8fdcfbc

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)) {