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

Commit 4813c00c authored by Brad Lassey's avatar Brad Lassey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "autoTransact" into main 

* changes:
  Add method to retrieve whether observe mode is currently enabled or not
  Add the ability to mark a polling loop filter to automatically transact
parents a0001981 ee03676a

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ package android { 
    field public static final int autoSizeTextType = 16844085; // 0x1010535

    field public static final int autoStart = 16843445; // 0x10102b5

    field @Deprecated public static final int autoText = 16843114; // 0x101016a

    field @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") public static final int autoTransact;

    field public static final int autoUrlDetect = 16843404; // 0x101028c

    field public static final int autoVerify = 16844014; // 0x10104ee

    field public static final int autofillHints = 16844118; // 0x1010556

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -10168,6 +10168,7 @@ package android.nfc.cardemulation { 
  @FlaggedApi("android.nfc.enable_nfc_mainline") public final class ApduServiceInfo implements android.os.Parcelable {

    ctor @FlaggedApi("android.nfc.enable_nfc_mainline") public ApduServiceInfo(@NonNull android.content.pm.PackageManager, @NonNull android.content.pm.ResolveInfo, boolean) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method @FlaggedApi("android.nfc.nfc_read_polling_loop") public void addPollingLoopFilter(@NonNull String);

    method @FlaggedApi("android.nfc.nfc_read_polling_loop") public void addPollingLoopFilterToAutoTransact(@NonNull String);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public int describeContents();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void dump(@NonNull android.os.ParcelFileDescriptor, @NonNull java.io.PrintWriter, @NonNull String[]);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void dumpDebug(@NonNull android.util.proto.ProtoOutputStream);
@@ -10181,6 +10182,7 @@ package android.nfc.cardemulation { 
    method @FlaggedApi("android.nfc.nfc_read_polling_loop") @NonNull public java.util.List<java.lang.String> getPollingLoopFilters();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public java.util.List<java.lang.String> getPrefixAids();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public String getSettingsActivityName();

    method @FlaggedApi("android.nfc.nfc_read_polling_loop") public boolean getShouldAutoTransact(@NonNull String);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public java.util.List<java.lang.String> getSubsetAids();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public int getUid();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean hasCategory(@NonNull String);

core/res/res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -4375,9 +4375,14 @@ 
    <!-- Specify one or more <code>polling-loop-filter</code> elements inside a

         <code>host-apdu-service</code> to indicate polling loop frames that

         your service can handle. -->

    <!-- @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") -->

    <declare-styleable name="PollingLoopFilter">

        <!-- The polling loop frame. This attribute is mandatory. -->

        <attr name="name" />

        <!-- Whether or not the system should automatically start a transaction when this polling

         loop filter matches. If not set, default value is false. -->

        <!-- @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") -->

        <attr name="autoTransact" format="boolean"/>

    </declare-styleable>















    <!-- Use <code>host-nfcf-service</code> as the root tag of the XML resource that

































core/res/res/values/public-staging.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -145,6 +145,8 @@













    <public name="fragmentSuffix"/>















    <!-- @FlaggedApi("com.android.text.flags.use_bounds_for_width") -->















    <public name="useBoundsForWidth"/>













    <!-- @FlaggedApi("android.nfc.Flags.FLAG_NFC_READ_POLLING_LOOP") -->













    <public name="autoTransact"/>















  </staging-public-group>































  <staging-public-group type="id" first-id="0x01bc0000">

































nfc/api/current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -73,6 +73,7 @@ package android.nfc {













    method @FlaggedApi("android.nfc.enable_nfc_charging") @Nullable public android.nfc.WlcListenerDeviceInfo getWlcListenerDeviceInfo();















    method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);















    method public boolean isEnabled();













    method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean isObserveModeEnabled();















    method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean isObserveModeSupported();















    method @FlaggedApi("android.nfc.enable_nfc_reader_option") public boolean isReaderOptionEnabled();















    method @FlaggedApi("android.nfc.enable_nfc_reader_option") public boolean isReaderOptionSupported();