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

Commit a082a164 authored by Brad Lassey's avatar Brad Lassey
Browse files

Remove NFC_READ_POLLING_LOOP flag that shipped in 24Q3 

Bug: 400450673
Test: EXEMPT flag change
Flag: EXEMPT flag change
Change-Id: Ia4b86f4bb684a08636057d4e60eb64131933170a
parent 1ed4cf25

core/api/system-current.txt

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

    ctor @FlaggedApi("android.nfc.nfc_apdu_service_info_constructor") public ApduServiceInfo(@NonNull android.content.pm.ResolveInfo, boolean, @NonNull String, @NonNull java.util.List<android.nfc.cardemulation.AidGroup>, @NonNull java.util.List<android.nfc.cardemulation.AidGroup>, boolean, int, int, @NonNull String, @NonNull String, @NonNull String);

    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, boolean);

    method @FlaggedApi("android.nfc.nfc_read_polling_loop") public void addPollingLoopPatternFilter(@NonNull String, boolean);

    method public void addPollingLoopFilter(@NonNull String, boolean);

    method public void addPollingLoopPatternFilter(@NonNull String, boolean);

    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);
@@ -10864,11 +10864,11 @@ package android.nfc.cardemulation { 
    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public String getDescription();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public android.nfc.cardemulation.AidGroup getDynamicAidGroupForCategory(@NonNull String);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @Nullable public String getOffHostSecureElement();

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

    method @FlaggedApi("android.nfc.nfc_read_polling_loop") @NonNull public java.util.List<java.util.regex.Pattern> getPollingLoopPatternFilters();

    method @NonNull public java.util.List<java.lang.String> getPollingLoopFilters();

    method @NonNull public java.util.List<java.util.regex.Pattern> getPollingLoopPatternFilters();

    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 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);
@@ -10879,8 +10879,8 @@ package android.nfc.cardemulation { 
    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public android.graphics.drawable.Drawable loadIcon(@NonNull android.content.pm.PackageManager);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public CharSequence loadLabel(@NonNull android.content.pm.PackageManager);

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

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

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

    method public void removePollingLoopFilter(@NonNull String);

    method public void removePollingLoopPatternFilter(@NonNull String);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean requiresScreenOn();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean requiresUnlock();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void resetOffHostSecureElement();

nfc-non-updatable/flags/flags.aconfig

+4 −4
Original line number Diff line number Diff line
@@ -34,18 +34,18 @@ flag { 
}



flag {

    name: "nfc_observe_mode"

    name: "nfc_read_polling_loop"

    is_exported: true

    namespace: "nfc"

    description: "Enable NFC Observe Mode"

    description: "Enable NFC Polling Loop Notifications"

    bug: "294217286"

}



flag {

    name: "nfc_read_polling_loop"

    name: "nfc_observe_mode"

    is_exported: true

    namespace: "nfc"

    description: "Enable NFC Polling Loop Notifications"

    description: "Enable NFC Observe Mode"

    bug: "294217286"

}

nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java

+0 −7
Original line number Diff line number Diff line
@@ -569,7 +569,6 @@ public final class ApduServiceInfo implements Parcelable { 
     * Returns the current polling loop filters for this service.

     * @return List of polling loop filters.

     */

    @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP)

    @NonNull

    public List<String> getPollingLoopFilters() {

        return new ArrayList<>(mAutoTransact.keySet());
@@ -581,7 +580,6 @@ public final class ApduServiceInfo implements Parcelable { 
     * @param plf the polling loop filter to query.

     * @return {@code true} indicating to auto transact, {@code false} indicating to not.

     */

    @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP)

    public boolean getShouldAutoTransact(@NonNull String plf) {

        if (mAutoTransact.getOrDefault(plf.toUpperCase(Locale.ROOT), false)) {

            return true;
@@ -605,7 +603,6 @@ public final class ApduServiceInfo implements Parcelable { 
     * Returns the current polling loop pattern filters for this service.

     * @return List of polling loop pattern filters.

     */

    @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP)

    @NonNull

    public List<Pattern> getPollingLoopPatternFilters() {

        return new ArrayList<>(mAutoTransactPatterns.keySet());
@@ -823,7 +820,6 @@ public final class ApduServiceInfo implements Parcelable { 
     * @param autoTransact when true, disable observe mode when this filter matches, when false,

     *                     matching does not change the observe mode state

     */

    @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP)

    public void addPollingLoopFilter(@NonNull String pollingLoopFilter,

            boolean autoTransact) {

        if (!PLF_PATTERN.matcher(pollingLoopFilter).matches()
@@ -843,7 +839,6 @@ public final class ApduServiceInfo implements Parcelable { 
     * longer be delivered to {@link HostApduService#processPollingFrames(List)}.

     * @param pollingLoopFilter this polling loop filter to add.

     */

    @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP)

    public void removePollingLoopFilter(@NonNull String pollingLoopFilter) {

        mAutoTransact.remove(pollingLoopFilter.toUpperCase(Locale.ROOT));

    }
@@ -857,7 +852,6 @@ public final class ApduServiceInfo implements Parcelable { 
     * @param autoTransact when true, disable observe mode when this filter matches, when false,

     *                     matching does not change the observe mode state

     */

    @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP)

    public void addPollingLoopPatternFilter(@NonNull String pollingLoopPatternFilter,

            boolean autoTransact) {

        if (!PLPF_PATTERN.matcher(pollingLoopPatternFilter).matches()) {
@@ -877,7 +871,6 @@ public final class ApduServiceInfo implements Parcelable { 
     * no longer be delivered to {@link HostApduService#processPollingFrames(List)}.

     * @param pollingLoopPatternFilter this polling loop filter to add.

     */

    @FlaggedApi(Flags.FLAG_NFC_READ_POLLING_LOOP)

    public void removePollingLoopPatternFilter(@NonNull String pollingLoopPatternFilter) {

        mAutoTransactPatterns.remove(

                Pattern.compile(pollingLoopPatternFilter.toUpperCase(Locale.ROOT)));