commit 0469e3b5bae95d4c4b5668c0bc9b8bb2db611fad
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 15 02:48:20 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 15 02:48:20 2022 +0000
tree 175fa8559f2cae2bc5ed80491134ea05037fca27
parent b65ba009036e3b32f5a8962d925ef6a5d611b367
parent 323606ee25ea8f6ae3f2994729b1c1e39ceabf87

Merge "Correct null UserHandle handling for ACTION_CHANGE_DEFAULT" into tm-dev

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 75746ce..d333b3d 100644
--- a/src/com/android/settings/nfc/PaymentDefaultDialog.java
+++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java
@@ -59,10 +59,13 @@
                 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)) {