Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddeaff9c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove EXTRA_USERID from NFC CardEmulation" am: 1a11b7b5 am:... 

Merge "Remove EXTRA_USERID from NFC CardEmulation" am: 1a11b7b5 am: f5d51cb6 am: 37e2084d am: a1d64e13

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

Change-Id: I4808f2bc6fae77ed3c34939f4e63e1fb6e4c1f53
parents d444fa5a a1d64e13

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -27445,7 +27445,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

core/java/android/nfc/cardemulation/CardEmulation.java

+0 −7
Original line number Diff line number Diff line
@@ -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.

     */