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

2c978920

Commit 2c978920 authored 1 year ago by Treehugger Robot Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "[Nfc framework] API to include/exclude Other category service...

Merge "[Nfc framework] API to include/exclude Other category service component" into main am: 8c7eea40

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

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

parents 47a697e6 8c7eea40

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/nfc/INfcCardEmulation.aidl 1 addition, 0 deletions

core/java/android/nfc/INfcCardEmulation.aidl
core/java/android/nfc/cardemulation/ApduServiceInfo.java 80 additions, 35 deletions

core/java/android/nfc/cardemulation/ApduServiceInfo.java
core/java/android/nfc/cardemulation/CardEmulation.java 33 additions, 0 deletions

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

with 114 additions and 35 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