Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NFC-F support in work profile" am: 8afd7f34f0

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

Change-Id: I1ff49639c9e92808afd91b8be169d96128be321f
This commit is contained in:
Jack Yu
2021-11-23 02:13:33 +00:00
committed by Automerger Merge Worker
parent 98951a99f4 8afd7f34f0
commit fc5e4fc100
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/nfc/cardemulation/NfcFCardEmulation.java
View File

@@ -25,7 +25,6 @@ import android.content.pm.PackageManager;
import android.nfc.INfcFCardEmulation; import android.nfc.INfcFCardEmulation;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import java.util.HashMap; import java.util.HashMap;

7
core/java/android/nfc/cardemulation/NfcFServiceInfo.java
View File

@@ -237,6 +237,7 @@ public final class NfcFServiceInfo implements Parcelable {
public String toString() { public String toString() {
StringBuilder out = new StringBuilder("NfcFService: "); StringBuilder out = new StringBuilder("NfcFService: ");
out.append(getComponent()); out.append(getComponent());
out.append(", UID: " + mUid);
out.append(", description: " + mDescription); out.append(", description: " + mDescription);
out.append(", System Code: " + mSystemCode); out.append(", System Code: " + mSystemCode);
if (mDynamicSystemCode != null) { if (mDynamicSystemCode != null) {
@@ -257,6 +258,7 @@ public final class NfcFServiceInfo implements Parcelable {
NfcFServiceInfo thatService = (NfcFServiceInfo) o; NfcFServiceInfo thatService = (NfcFServiceInfo) o;
if (!thatService.getComponent().equals(this.getComponent())) return false; if (!thatService.getComponent().equals(this.getComponent())) return false;
if (thatService.getUid() != this.getUid()) return false;
if (!thatService.mSystemCode.equalsIgnoreCase(this.mSystemCode)) return false; if (!thatService.mSystemCode.equalsIgnoreCase(this.mSystemCode)) return false;
if (!thatService.mNfcid2.equalsIgnoreCase(this.mNfcid2)) return false; if (!thatService.mNfcid2.equalsIgnoreCase(this.mNfcid2)) return false;
if (!thatService.mT3tPmm.equalsIgnoreCase(this.mT3tPmm)) return false; if (!thatService.mT3tPmm.equalsIgnoreCase(this.mT3tPmm)) return false;
@@ -321,8 +323,9 @@ public final class NfcFServiceInfo implements Parcelable {
}; };
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
pw.println(" " + getComponent() + pw.println(" " + getComponent()
" (Description: " + getDescription() + ")"); + " (Description: " + getDescription() + ")"
+ " (UID: " + getUid() + ")");
pw.println(" System Code: " + getSystemCode()); pw.println(" System Code: " + getSystemCode());
pw.println(" NFCID2: " + getNfcid2()); pw.println(" NFCID2: " + getNfcid2());
pw.println(" T3tPmm: " + getT3tPmm()); pw.println(" T3tPmm: " + getT3tPmm());