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

Commit 467a55fa authored by Roshan Pius's avatar Roshan Pius
Browse files

nfc(api): Move nfc classes to framework-nfc 

Splits out the NFC API classes that are going to be part of NFC mainline
module.

Note: These files will be eventually moved out to packages/modules/Nfc
at some point.

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
Merged-In: I41c1146401236963b9fd83f214fed0b6cecf325e

Change-Id: I41c1146401236963b9fd83f214fed0b6cecf325e
parent 96dac95f

AconfigFlags.bp

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.nfc.flags-aconfig",

    package: "android.nfc",

    srcs: ["core/java/android/nfc/*.aconfig"],

    srcs: ["nfc/java/android/nfc/*.aconfig"],

}



cc_aconfig_library {
@@ -137,7 +137,7 @@ cc_aconfig_library { 
java_aconfig_library {

    name: "android.nfc.flags-aconfig-java",

    aconfig_declarations: "android.nfc.flags-aconfig",

    min_sdk_version: "VanillaIceCream",

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

core/api/current.txt

+0 −438

File changed.

Preview size limit exceeded, changes collapsed.

core/api/module-lib-current.txt

+0 −5
Original line number Diff line number Diff line
@@ -356,11 +356,6 @@ package android.net.wifi { 


package android.nfc {



  public class NfcFrameworkInitializer {

    method public static void registerServiceWrappers();

    method public static void setNfcServiceManager(@NonNull android.nfc.NfcServiceManager);

  }



  public class NfcServiceManager {

    method @NonNull public android.nfc.NfcServiceManager.ServiceRegisterer getNfcManagerServiceRegisterer();

  }

core/api/removed.txt

+0 −16
Original line number Diff line number Diff line
@@ -252,22 +252,6 @@ package android.net { 


}



package android.nfc {



  public final class NfcAdapter {

    method @Deprecated public void disableForegroundNdefPush(android.app.Activity);

    method @Deprecated public void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);

    method @Deprecated public boolean invokeBeam(android.app.Activity);

    method @Deprecated public boolean isNdefPushEnabled();

    method @Deprecated public void setBeamPushUris(android.net.Uri[], android.app.Activity);

    method @Deprecated public void setBeamPushUrisCallback(android.nfc.NfcAdapter.CreateBeamUrisCallback, android.app.Activity);

    method @Deprecated public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...);

    method @Deprecated public void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...);

    method @Deprecated public void setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...);

  }



}



package android.os {



  public class BatteryManager {

core/api/system-current.txt

+0 −40
Original line number Diff line number Diff line
@@ -10236,42 +10236,6 @@ package android.net.wifi.sharedconnectivity.service { 














}



























package android.nfc {

























  public final class NfcAdapter {













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean addNfcUnlockHandler(android.nfc.NfcAdapter.NfcUnlockHandler, String[]);













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean disable();













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean disable(boolean);













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enable();













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













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableSecureNfc(boolean);













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













    method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public java.util.Map<java.lang.String,java.lang.Boolean> getTagIntentAppPreferenceForUser(int);













    method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean isControllerAlwaysOn();













    method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean isControllerAlwaysOnSupported();













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean isTagIntentAppPreferenceSupported();













    method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public void registerControllerAlwaysOnListener(@NonNull java.util.concurrent.Executor, @NonNull android.nfc.NfcAdapter.ControllerAlwaysOnListener);













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean removeNfcUnlockHandler(android.nfc.NfcAdapter.NfcUnlockHandler);













    method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean setControllerAlwaysOn(boolean);













    method @FlaggedApi("android.nfc.enable_nfc_mainline") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setReaderMode(boolean);













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int setTagIntentAppPreferenceForUser(int, @NonNull String, boolean);













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













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













    field public static final int TAG_INTENT_APP_PREF_RESULT_PACKAGE_NOT_FOUND = -1; // 0xffffffff













    field public static final int TAG_INTENT_APP_PREF_RESULT_SUCCESS = 0; // 0x0













    field public static final int TAG_INTENT_APP_PREF_RESULT_UNAVAILABLE = -2; // 0xfffffffe













  }

























  public static interface NfcAdapter.ControllerAlwaysOnListener {













    method public void onControllerAlwaysOnChanged(boolean);













  }

























  public static interface NfcAdapter.NfcUnlockHandler {













    method public boolean onUnlockAttempted(android.nfc.Tag);













  }

























}



























package android.nfc.cardemulation {





























  @FlaggedApi("android.nfc.enable_nfc_mainline") public final class AidGroup implements android.os.Parcelable {










@@ -10320,10 +10284,6 @@ package android.nfc.cardemulation {













    field @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public static final android.os.Parcelable.Creator<android.nfc.cardemulation.ApduServiceInfo> CREATOR;















  }



























  public final class CardEmulation {













    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public java.util.List<android.nfc.cardemulation.ApduServiceInfo> getServices(@NonNull String, int);













  }



























  @FlaggedApi("android.nfc.enable_nfc_mainline") public final class NfcFServiceInfo implements android.os.Parcelable {















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















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