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

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

Merge "nfc(frameworks): Move NFC codebase to packages/modules/Nfc" into main

parents ba2ddbe8 06755e2f

nfc/Android.bp

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
package {

    default_team: "trendy_team_fwk_nfc",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

    name: "framework-nfc-updatable-sources",

    path: "java",

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

    ],

    visibility: [

        "//frameworks/base:__subpackages__",

        "//packages/apps/Nfc:__subpackages__",

        "//packages/modules/Nfc:__subpackages__",

    ],

}



java_sdk_library {

    name: "framework-nfc",

    libs: [

        "androidx.annotation_annotation",

        "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage

        "framework-permission-s.stubs.module_lib",

        "framework-permission.stubs.module_lib",

    ],

    stub_only_libs: [

        // Needed for javadoc references.

        "framework-permission-s.stubs.module_lib",

    ],

    static_libs: [

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

        "android.permission.flags-aconfig-java",

    ],

    srcs: [

        ":framework-nfc-updatable-sources",

        ":framework-nfc-javastream-protos",

    ],

    defaults: ["framework-module-defaults"],

    sdk_version: "module_current",

    min_sdk_version: "35", // Make it 36 once available.

    installable: true,

    optimize: {

        enabled: false,

    },

    hostdex: true, // for hiddenapi check

    permitted_packages: [

        "android.nfc",

        "com.android.nfc",

    ],

    impl_library_visibility: [

        "//frameworks/base:__subpackages__",

        "//cts:__subpackages__",

        "//packages/apps/Nfc:__subpackages__",

        "//packages/modules/Nfc:__subpackages__",

    ],

    jarjar_rules: ":nfc-jarjar-rules",

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

    aconfig_declarations: [

        "android.nfc.flags-aconfig",

    ],

}



filegroup {

    name: "nfc-jarjar-rules",

    srcs: ["jarjar-rules.txt"],

}

nfc/OWNERS

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# Bug component: 48448

include platform/packages/apps/Nfc:/OWNERS
 
 No newline at end of file

nfc/TEST_MAPPING

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "NfcManagerTests"

    },

    {

      "name": "CtsNfcTestCases"

    },

    {

      "name": "CtsNdefTestCases"

    }

  ]

}

nfc/api/current.txt

deleted100644 → 0
+0 −495

File deleted.

Preview size limit exceeded, changes collapsed.

nfc/api/lint-baseline.txt

deleted100644 → 0
+0 −95
Original line number Diff line number Diff line 
// Baseline format: 1.0

BroadcastBehavior: android.nfc.NfcAdapter#ACTION_ADAPTER_STATE_CHANGED:

    Field 'ACTION_ADAPTER_STATE_CHANGED' is missing @BroadcastBehavior

BroadcastBehavior: android.nfc.NfcAdapter#ACTION_PREFERRED_PAYMENT_CHANGED:

    Field 'ACTION_PREFERRED_PAYMENT_CHANGED' is missing @BroadcastBehavior

BroadcastBehavior: android.nfc.NfcAdapter#ACTION_TRANSACTION_DETECTED:

    Field 'ACTION_TRANSACTION_DETECTED' is missing @BroadcastBehavior





MissingNullability: android.nfc.cardemulation.OffHostApduService#onBind(android.content.Intent):

    Missing nullability on method `onBind` return

MissingNullability: android.nfc.cardemulation.OffHostApduService#onBind(android.content.Intent) parameter #0:

    Missing nullability on parameter `intent` in method `onBind`





RequiresPermission: android.nfc.NfcAdapter#disableForegroundDispatch(android.app.Activity):

    Method 'disableForegroundDispatch' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.NfcAdapter#enableForegroundDispatch(android.app.Activity, android.app.PendingIntent, android.content.IntentFilter[], String[][]):

    Method 'enableForegroundDispatch' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.cardemulation.CardEmulation#isDefaultServiceForAid(android.content.ComponentName, String):

    Method 'isDefaultServiceForAid' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.cardemulation.CardEmulation#isDefaultServiceForCategory(android.content.ComponentName, String):

    Method 'isDefaultServiceForCategory' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.cardemulation.CardEmulation#setOffHostForService(android.content.ComponentName, String):

    Method 'setOffHostForService' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.nfc.tech.IsoDep#getTimeout():

    Method 'getTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.IsoDep#setTimeout(int):

    Method 'setTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.IsoDep#transceive(byte[]):

    Method 'transceive' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#authenticateSectorWithKeyA(int, byte[]):

    Method 'authenticateSectorWithKeyA' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#authenticateSectorWithKeyB(int, byte[]):

    Method 'authenticateSectorWithKeyB' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#decrement(int, int):

    Method 'decrement' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#getTimeout():

    Method 'getTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#increment(int, int):

    Method 'increment' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#readBlock(int):

    Method 'readBlock' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#restore(int):

    Method 'restore' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#setTimeout(int):

    Method 'setTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#transceive(byte[]):

    Method 'transceive' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#transfer(int):

    Method 'transfer' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareClassic#writeBlock(int, byte[]):

    Method 'writeBlock' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareUltralight#getTimeout():

    Method 'getTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareUltralight#readPages(int):

    Method 'readPages' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareUltralight#setTimeout(int):

    Method 'setTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareUltralight#transceive(byte[]):

    Method 'transceive' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.MifareUltralight#writePage(int, byte[]):

    Method 'writePage' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.Ndef#getNdefMessage():

    Method 'getNdefMessage' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.Ndef#isWritable():

    Method 'isWritable' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.Ndef#makeReadOnly():

    Method 'makeReadOnly' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.Ndef#writeNdefMessage(android.nfc.NdefMessage):

    Method 'writeNdefMessage' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NdefFormatable#format(android.nfc.NdefMessage):

    Method 'format' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NdefFormatable#formatReadOnly(android.nfc.NdefMessage):

    Method 'formatReadOnly' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NfcA#getTimeout():

    Method 'getTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NfcA#setTimeout(int):

    Method 'setTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NfcA#transceive(byte[]):

    Method 'transceive' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NfcB#transceive(byte[]):

    Method 'transceive' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NfcF#getTimeout():

    Method 'getTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NfcF#setTimeout(int):

    Method 'setTimeout' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NfcF#transceive(byte[]):

    Method 'transceive' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.NfcV#transceive(byte[]):

    Method 'transceive' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.TagTechnology#close():

    Method 'close' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.nfc.tech.TagTechnology#connect():

    Method 'connect' documentation mentions permissions without declaring @RequiresPermission