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

Commit 90d765df authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "nfc(api): Fix flag for unregisterNfcVendorNciCallback" into main

parents 8c7a8205 d4c50e82

nfc/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ package android.nfc { 
    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int setTagIntentAppPreferenceForUser(int, @NonNull String, boolean);

    method @FlaggedApi("android.nfc.enable_nfc_charging") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean setWlcEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public void unregisterControllerAlwaysOnListener(@NonNull android.nfc.NfcAdapter.ControllerAlwaysOnListener);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void unregisterNfcVendorNciCallback(@NonNull android.nfc.NfcAdapter.NfcVendorNciCallback);

    method @FlaggedApi("android.nfc.nfc_vendor_cmd") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void unregisterNfcVendorNciCallback(@NonNull android.nfc.NfcAdapter.NfcVendorNciCallback);

    method @FlaggedApi("android.nfc.enable_nfc_charging") public void unregisterWlcStateListener(@NonNull android.nfc.NfcAdapter.WlcStateListener);

    field @FlaggedApi("android.nfc.enable_nfc_mainline") public static final String ACTION_REQUIRE_UNLOCK_FOR_NFC = "android.nfc.action.REQUIRE_UNLOCK_FOR_NFC";

    field @FlaggedApi("android.nfc.nfc_vendor_cmd") public static final int MESSAGE_TYPE_COMMAND = 1; // 0x1

nfc/java/android/nfc/NfcAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -3103,7 +3103,7 @@ public final class NfcAdapter { 
     * @hide

     */

    @SystemApi

    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)

    @FlaggedApi(Flags.FLAG_NFC_VENDOR_CMD)

    @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)

    public void unregisterNfcVendorNciCallback(@NonNull NfcVendorNciCallback callback) {

        mNfcVendorNciCallbackListener.unregister(callback);