Commit Graph

363 Commits

Author SHA1 Message Date
Ioannis Ilkos
2b6277245a Add statically built regex pattern to avoid rebuilding all the time
Bug: b/129682219
Change-Id: I4a94c641d99964bed96ecb1725b84c8a9331879d
Test: Build, treehugger
2019-04-02 09:23:19 +00:00
Jack Yu
c4d52632e8 Merge "Update Android Beam deprecated API description" am: 527b6de018 am: 8b855b16f3
am: 862152f8cd

Change-Id: I0ddd6f1bffc709ffe93e194cd38996758cf48484
2019-03-27 19:09:38 -07:00
Jack Yu
65b438b07a Update Android Beam deprecated API description
Bug: 127532226
Test: None
Change-Id: Id3a769c4cf97bbaee751fd5dc0831bdc5993ef50
2019-03-25 06:29:55 +00:00
Ruchi Kandoi
5e72196be3 Merge "Add @NonNull annotations to (un)setOffHostForService()" am: 78366e46b2 am: 049cd3b67e
am: 0baada5d2a

Change-Id: I207de7be71246830bbf01e0c6b126892997ccadc
2019-03-08 06:42:19 -08:00
Treehugger Robot
78366e46b2 Merge "Add @NonNull annotations to (un)setOffHostForService()" 2019-03-07 20:07:16 +00:00
Ruchi Kandoi
3b2e5c3d02 Merge "Update Secure NFC API definitions" 2019-03-07 18:44:52 +00:00
Ruchi Kandoi
2d09e5c41f Update Secure NFC API definitions
Bug: 124767797
Test: None
Change-Id: If78d90fdc0a24d5f44bbb582f388a9c60b12786c
2019-03-05 10:17:54 -08:00
Ruchi Kandoi
4480f2592e Add @NonNull annotations to (un)setOffHostForService()
Test: None
Bug: 126699330
Bug: 126701964
Change-Id: Id8edf1720ee391d51eef70daeba63133c1efb339
2019-03-04 14:42:32 -08:00
Jeff Sharkey
9e8f83db6d All Parcelable CREATOR fields are @NonNull.
If they were null, then the Parcelable would fail to work.

Bug: 126726802
Test: manual
Change-Id: I7929ffa2f20e5de1c8e68e8263cca99496e9d014
Exempt-From-Owner-Approval: Trivial API annotations
2019-02-28 23:29:04 -07:00
Andrei Onea
efd37eff41 Add @UnsupportedAppUsage annotations
For packages:
  android.net
  android.net.wifi
  android.nfc

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04
Change-Id: I16570aef456b45a5543bf889dddc7a0d25441928
2019-02-28 14:39:20 +00:00
Andrei Onea
9a8b6bf0f1 Add @UnsupportedAppUsage annotations
For packages:
  android.net
  android.net.wifi
  android.nfc

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04
2019-02-27 13:31:33 +00:00
Xin Li
0e71b4f19b DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into
stage-aosp-master

Bug: 124234733
Change-Id: Ic4f67fde0835da0b1c363906cccef0d244e38393
2019-02-14 09:48:06 -08:00
Ruchi Kandoi
d8c592703d Merge "Add Secure NFC functionality" am: 3ffdb26aa8 am: c538141c6d
am: 32b84ede51

Change-Id: I67f436d48dfd5578d04d284e7669685760b0716f
2019-01-28 22:59:55 -08:00
Ruchi Kandoi
32b84ede51 Merge "Add Secure NFC functionality" am: 3ffdb26aa8
am: c538141c6d

Change-Id: I5e1c1d44396099c841f09bfdd2ac956f01fd4ceb
2019-01-28 22:14:28 -08:00
Ruchi Kandoi
d97bb0929e Add Secure NFC functionality
Test: Toggle NFC switch; Manual check functionality
Change-Id: Ib57e6f8162f93f2f028e6bcc063ab3466f9c5474
2019-01-23 15:11:36 -08:00
Ruchi Kandoi
d98f84b0d9 Merge "Deprecate Android beam APIs and create a feature flag to gate them" am: 6a3d45c4b2 am: d0c8a165d8
am: a33da54c8d

Change-Id: I1eda6b7d5879045e6bd35821ee5368ef72855942
2019-01-04 14:18:15 -08:00
Ruchi Kandoi
a33da54c8d Merge "Deprecate Android beam APIs and create a feature flag to gate them" am: 6a3d45c4b2
am: d0c8a165d8

Change-Id: I886941a5011fdf204fe62c1162dd2ad69d466f62
2019-01-04 14:06:55 -08:00
Ruchi Kandoi
96fe50bc1b Deprecate Android beam APIs and create a feature flag to gate them
Test: Test application trying to invoke the API
Bug: 117519147
Change-Id: Icd3187e4f3e0f180cb42d36011f60895fb395002
2019-01-04 21:49:00 +00:00
Ruchi Kandoi
0e1c39bf55 Merge changes from topic "multi-se-support" am: 54502d68ea am: 9c0ec9be9f
am: 650ff88a4c

Change-Id: I562af1c9c1b0c254d8b23466caceb94ef767aa1f
2019-01-04 12:38:53 -08:00
Ruchi Kandoi
650ff88a4c Merge changes from topic "multi-se-support" am: 54502d68ea
am: 9c0ec9be9f

Change-Id: Ieca9b142094c8c568409290fdf690fad529ef604
2019-01-04 12:25:13 -08:00
Ruchi Kandoi
44bb579621 Add a mechanism to register AIDs to specific off-host SE
Test: manual
Bug: 117253962
Change-Id: Id34bf84dcff7789548eac19478010838bebd9758
2019-01-04 01:14:50 +00:00
Ruchi Kandoi
ebf267a2a4 Add Off-Host Card Emulation Features
Test: CTS test; manual
Bug: 117253962
Change-Id: I7c35b1bffbc57870bb8c67704811a2649854d94e
2019-01-03 23:00:59 +00:00
Nathan Harold
41e2d7494f Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed
am: 13c9e7e2f3

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e
2018-10-24 16:14:06 -07:00
Mathew Inwood
45d2c252b1 Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 8c854f86a4)
2018-10-22 17:28:24 -07:00
kopriva
c7d26d48ce Merge "docs: bug 37128155, broken link" into pi-dev am: 415e35525f
am: cc5deaf7d5

Change-Id: I41b0ec4bc5fb9d9c3ace80a0d21d3f4d1ea6d29f
2018-10-08 23:37:48 -07:00
kopriva
cc5deaf7d5 Merge "docs: bug 37128155, broken link" into pi-dev
am: 415e35525f

Change-Id: I2ef8a7bcb904734d5d7073e57c7a2bdc1334fe2c
2018-10-08 23:28:36 -07:00
kopriva
ee2eda11e6 docs: bug 37128155, broken link
Test: make ds-docs

Bug: 37128155

Change-Id: I39e432b6000b9c32ef62bc10f2d8ad343b9305f9
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 14:47:12 -07:00
kopriva
64c4523ed4 Merge "docs: fixed five typos" into pi-dev am: 82b413428e
am: d366837e05

Change-Id: I0cf5630bc936c872ca936f2d3de9e8aaa509f083
2018-09-18 12:10:35 -07:00
kopriva
d366837e05 Merge "docs: fixed five typos" into pi-dev
am: 82b413428e

Change-Id: I4af571d6bcfa151235223b51cb8135fbacb62c82
2018-09-18 12:00:24 -07:00
kopriva
7ecfe31427 docs: fixed five typos
Test: make ds-docs

Bug: 37095452
Bug: 37001217
Bug: 37004068
Bug: 37015340
Bug: 37044652

Change-Id: Ib305df88b63286810d7722e73321ddb238b45e8e
Exempt-From-Owner-Approval: Docs-only change
2018-09-17 15:17:50 -07:00
Mathew Inwood
8c854f86a4 Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
2018-09-14 13:18:34 +01:00
Mathew Inwood
580f86d883 resolve merge conflicts of 92b78539e3 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I6176e760bb0912fd075a36d65fa0b49680c14aa3
Change-Id: I71a17fa603fcd2339bfca54f9e5a7740bc54972f
2018-08-03 11:05:23 +01:00
Mathew Inwood
1961e1ef8c Add @UnsupportedAppUsage annotations
For packages:
  android.nfc.tech
  android.nfc.dta
  android.nfc.cardemulation
  android.nfc

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I6176e760bb0912fd075a36d65fa0b49680c14aa3
Change-Id: I2da62ff82b75ba4a5a0a64d02c6ebdb101992765
2018-07-31 16:08:26 +01:00
Mathew Inwood
57069dc834 Add @UnsupportedAppUsage annotations
For packages:
  android.nfc.tech
  android.nfc.dta
  android.nfc.cardemulation
  android.nfc

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I6176e760bb0912fd075a36d65fa0b49680c14aa3
2018-07-31 15:33:20 +01:00
Aurimas Liutikas
e701dc1799 Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.

Test: make docs
Change-Id: If7830ece85f8d1f27c991eae282230814726e115
Exempt-From-Owner-Approval: Fixing @see javadoc link issues that are currently completely broken
2018-06-04 10:15:22 -07:00
Aurimas Liutikas
7f6953369a Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.

Test: make docs
Exempt-From-Owner-Approval: Fixing @see javadoc link issues that are currently completely broken
Change-Id: I767e9fb9842494e5eccef2a7bdeee3877c488b5d
2018-06-01 17:15:55 +00:00
Ruchi Kandoi
a3180099bf Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" am: 01cef932c8
am: 7ad52283ab

Change-Id: I4cdeed1b3b55de95e58c8784e379ccfe9da7e4d8
2018-03-16 21:43:04 +00:00
Ruchi Kandoi
14a8b1e318 NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME
Test: compiles
Bug: 74976874
Change-Id: Ied783f57078aaa37017cc821adf329ececac74f3
(cherry picked from commit 9a33aefd65)
2018-03-15 16:08:29 -07:00
Ruchi Kandoi
9a33aefd65 NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME
Test: compiles
Bug: 74976874
Change-Id: Ied783f57078aaa37017cc821adf329ececac74f3
2018-03-15 15:16:39 -07:00
Ruchi Kandoi
01de0a82cc Merge "Add NFC Transaction Event intent actions and extras" am: 337e2feada am: 8b35111d3e
am: 9750a6f69a

Change-Id: I8c9f734f8e51ecae23cb225a4295e1b6b63be307
2018-02-04 00:44:02 +00:00
Jeff Sharkey
ad357d1839 Pass in the user defined by Context.
The majority of Manager-style classes already use Context.getUserId()
when making calls into the OS, so clean up the remaining callers to
unify behind this strategy.

This gives @SystemApi developers a nice clean interface to interact
across user boundaries, instead of manually adding "AsUser" or
"ForUser" method variants, which would quickly become unsustainable.

Test: builds, boots
Bug: 72863821
Exempt-From-Owner-Approval: trivial changes
Change-Id: Ib772ec4438e57a2ad4950821b9432f9842998451
2018-02-03 02:11:45 +00:00
Ruchi Kandoi
a077161382 Add NFC Transaction Event intent actions and extras
Bug: 72556384
Bug: 65127791
Test: Test App check for RF Events
Change-Id: I22f5e3d8dc11d518c96a74e54121e072caa6a18d
2018-02-02 09:19:08 -08:00
Love Khanna
f5d6d5c1a8 Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (FFFFFFFFFFFFFFFF) as per NCI specification.

Bug: 64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
(cherry picked from commit 20a77e973f62f145ab7b3a4822ce34407c0ca476)
2017-08-01 17:28:09 +00:00
Love Khanna
755a8fa44e NFC DTA Integration
Bug: 63903843
Test: compiles.
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-20 22:15:39 +00:00
Love Khanna
ca26b128ea NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
As per NCI2.0 LF_T3T_PMM is a part of LF_T3T_IDENTIFIER.
Since it is required for each LF_T3T_IDENTIFIER entry,
It can be taken from application.

Test: Compiles.

Change-Id: Icc168592c292d869a4c331dd28fe43b4d75c9a41
(cherry picked from commit e7ecebae11)
2017-07-06 11:57:42 -07:00
Love Khanna
68f719e196 AID suffix registration.
Test: compiles.

Change-Id: I0ab02599814722055d77eef29e734bfd45e8d1ee
(cherry picked from commit e910e8bf86)
2017-07-06 11:57:20 -07:00
Jeff Sharkey
d86b8fea43 Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.

Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug: 62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
2017-06-05 13:27:11 -06:00
TreeHugger Robot
1573489991 Merge "Make NFC AIDL callbacks oneway" into oc-dev 2017-05-31 00:26:37 +00:00
Ruchi Kandoi
03f9e978c1 Make NFC AIDL callbacks oneway
Test: Read NFC tags, Android Beam
Bug: 32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit 5dc487d588)
2017-05-26 14:11:28 -07:00
Yuka Anami
c03eaa6853 Add ID_LENGTH field for Empty type record
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.

Bug: 38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
(cherry picked from commit ef9d0a480ef72a4ff0de5b5afa3661cff81fd8b5)
2017-05-26 20:53:59 +00:00