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

Commit 2e9f65f9 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "Make NfcAdapter states public and fix build."

parents ceea8857 e55fe4f3

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -13793,6 +13793,10 @@ package android.nfc { 
    field public static final java.lang.String EXTRA_ID = "android.nfc.extra.ID";

    field public static final java.lang.String EXTRA_NDEF_MESSAGES = "android.nfc.extra.NDEF_MESSAGES";

    field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG";

    field public static final int STATE_OFF = 1; // 0x1

    field public static final int STATE_ON = 3; // 0x3

    field public static final int STATE_TURNING_OFF = 4; // 0x4

    field public static final int STATE_TURNING_ON = 2; // 0x2

  }















  public static abstract interface NfcAdapter.CreateBeamUrisCallback {

























core/java/android/nfc/NfcAdapter.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -190,13 +190,9 @@ public final class NfcAdapter {













     */















    public static final String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE";





























    /** @hide */















    public static final int STATE_OFF = 1;













    /** @hide */















    public static final int STATE_TURNING_ON = 2;













    /** @hide */















    public static final int STATE_ON = 3;













    /** @hide */















    public static final int STATE_TURNING_OFF = 4;































    /** @hide */