From c5942cc29368d43fc754bc3a611999aa8a8e3180 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 15 Feb 2022 13:54:44 +0800 Subject: [PATCH] Remove EXTRA_USERID from NFC CardEmulation Based on suggestion, use existing Intent.EXTRA_USER to pass the UserHandle as the extra field of ACTION_CHANGE_DEFAULT. Bug: 215300017 Test: manual Change-Id: I15c5032f0229e8049fa1ef3741638974189ac3cf --- core/api/current.txt | 1 - core/java/android/nfc/cardemulation/CardEmulation.java | 7 ------- 2 files changed, 8 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 3a8076c932b72..b66779a25a4d8 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -26189,7 +26189,6 @@ package android.nfc.cardemulation { field public static final String CATEGORY_PAYMENT = "payment"; field public static final String EXTRA_CATEGORY = "category"; field public static final String EXTRA_SERVICE_COMPONENT = "component"; - field public static final String EXTRA_USERID = "android.nfc.cardemulation.extra.USERID"; field public static final int SELECTION_MODE_ALWAYS_ASK = 1; // 0x1 field public static final int SELECTION_MODE_ASK_IF_CONFLICT = 2; // 0x2 field public static final int SELECTION_MODE_PREFER_DEFAULT = 0; // 0x0 diff --git a/core/java/android/nfc/cardemulation/CardEmulation.java b/core/java/android/nfc/cardemulation/CardEmulation.java index 0a9fe90f25249..9a780c8a29359 100644 --- a/core/java/android/nfc/cardemulation/CardEmulation.java +++ b/core/java/android/nfc/cardemulation/CardEmulation.java @@ -83,13 +83,6 @@ public final class CardEmulation { */ public static final String EXTRA_SERVICE_COMPONENT = "component"; - /** - * The caller userId extra for {@link #ACTION_CHANGE_DEFAULT}. - * - * @see #ACTION_CHANGE_DEFAULT - */ - public static final String EXTRA_USERID = "android.nfc.cardemulation.extra.USERID"; - /** * Category used for NFC payment services. */