Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c60efe59 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "nfc(api): Fix HCE services metadata name in javadoc." into main am:... 

Merge "nfc(api): Fix HCE services metadata name in javadoc." into main am: 219a0d17 am: b03d0b49

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



Change-Id: I06867cdee60c47088de0a9b9f1b93972524192d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44407507 b03d0b49

nfc/java/android/nfc/cardemulation/HostApduService.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ import java.util.List; 
 *     &lt;intent-filter&gt;

 *         &lt;action android:name="android.nfc.cardemulation.action.HOST_APDU_SERVICE"/&gt;

 *     &lt;/intent-filter&gt;

 *     &lt;meta-data android:name="android.nfc.cardemulation.host_apdu_ervice" android:resource="@xml/apduservice"/&gt;

 *     &lt;meta-data android:name="android.nfc.cardemulation.host_apdu_service" android:resource="@xml/apduservice"/&gt;

 * &lt;/service&gt;</pre>

 *

 * This meta-data tag points to an apduservice.xml file.

nfc/java/android/nfc/cardemulation/OffHostApduService.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ import android.os.IBinder; 
 *     &lt;intent-filter&gt;

 *         &lt;action android:name="android.nfc.cardemulation.action.OFF_HOST_APDU_SERVICE"/&gt;

 *     &lt;/intent-filter&gt;

 *     &lt;meta-data android:name="android.nfc.cardemulation.off_host_apdu_ervice" android:resource="@xml/apduservice"/&gt;

 *     &lt;meta-data android:name="android.nfc.cardemulation.off_host_apdu_service" android:resource="@xml/apduservice"/&gt;

 * &lt;/service&gt;</pre>

 *

 * This meta-data tag points to an apduservice.xml file.