Merge "Remove EXTRA_USERID from NFC CardEmulation"
This commit is contained in:
@@ -26189,7 +26189,6 @@ package android.nfc.cardemulation {
|
|||||||
field public static final String CATEGORY_PAYMENT = "payment";
|
field public static final String CATEGORY_PAYMENT = "payment";
|
||||||
field public static final String EXTRA_CATEGORY = "category";
|
field public static final String EXTRA_CATEGORY = "category";
|
||||||
field public static final String EXTRA_SERVICE_COMPONENT = "component";
|
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_ALWAYS_ASK = 1; // 0x1
|
||||||
field public static final int SELECTION_MODE_ASK_IF_CONFLICT = 2; // 0x2
|
field public static final int SELECTION_MODE_ASK_IF_CONFLICT = 2; // 0x2
|
||||||
field public static final int SELECTION_MODE_PREFER_DEFAULT = 0; // 0x0
|
field public static final int SELECTION_MODE_PREFER_DEFAULT = 0; // 0x0
|
||||||
|
|||||||
@@ -83,13 +83,6 @@ public final class CardEmulation {
|
|||||||
*/
|
*/
|
||||||
public static final String EXTRA_SERVICE_COMPONENT = "component";
|
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.
|
* Category used for NFC payment services.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user