Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

461c22fc

Commit 461c22fc authored 1 year ago by Alisher Alikhodjaev Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "Implementation of Dedicated card mode APIs changes (Discovery tech and...

Merge "Implementation of Dedicated card mode APIs changes (Discovery tech and Change Routing)" into main am: eed159fc am: b17d3b91

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2850158

Change-Id: Ie8f9d33ed60fcb9a3523cfc14facceaceb57cd1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 07ab433f b17d3b91

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 9 additions, 0 deletions

core/api/current.txt
core/java/android/nfc/INfcAdapter.aidl 1 addition, 0 deletions

core/java/android/nfc/INfcAdapter.aidl
core/java/android/nfc/INfcCardEmulation.aidl 3 additions, 0 deletions

core/java/android/nfc/INfcCardEmulation.aidl
core/java/android/nfc/NfcActivityManager.java 74 additions, 0 deletions

core/java/android/nfc/NfcActivityManager.java
core/java/android/nfc/NfcAdapter.java 177 additions, 18 deletions

core/java/android/nfc/NfcAdapter.java
core/java/android/nfc/cardemulation/CardEmulation.java 81 additions, 0 deletions

core/java/android/nfc/cardemulation/CardEmulation.java
core/java/android/nfc/flags.aconfig 7 additions, 0 deletions

core/java/android/nfc/flags.aconfig

with 352 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment