Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

a49117c9

Commit a49117c9 authored 1 year ago by Roshan Pius Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "nfc(api): Expose formal APIs for APIs used by settings/sysui" into main am: 7c342823

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

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

parents ce9fbaca 7c342823

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

core/api/system-current.txt 6 additions, 0 deletions

core/api/system-current.txt
core/java/android/nfc/NfcAdapter.java 4 additions, 1 deletion

core/java/android/nfc/NfcAdapter.java
core/java/android/nfc/cardemulation/CardEmulation.java 12 additions, 1 deletion

core/java/android/nfc/cardemulation/CardEmulation.java

with 22 additions and 2 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