Merge "Remove EXTRA_USERID from NFC CardEmulation" am: 1a11b7b5d5 am: f5d51cb655

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984767

Change-Id: Ibe79b6657a607d94524dd2e1959668ad762a5e63
This commit is contained in:
Treehugger Robot
2022-02-22 02:29:49 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 8 deletions

View File

@@ -26249,7 +26249,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

View File

@@ -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.
*/