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

9c18676c

Commit 9c18676c authored 1 year ago by Alisher Alikhodjaev Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "Address API council feedback for setDiscoveryTechnology flags" into main am: 641ad042

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

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

parents ad675e39 641ad042

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

nfc/api/current.txt 2 additions, 2 deletions

nfc/api/current.txt
nfc/java/android/nfc/NfcAdapter.java 17 additions, 6 deletions

nfc/java/android/nfc/NfcAdapter.java

with 19 additions and 8 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