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

Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b4e am: f18917783c am: 53f9a60d8f

Browse Source 
am: 80d1a65288

Change-Id: I33ebb180831878166645520f95864972b17191c2
This commit is contained in:
Akinobu Nakashima
2019-08-27 10:38:49 -07:00
committed by android-build-merger
parent 1249840cbc 80d1a65288
commit b0c17a68c8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/nfc/cardemulation/ApduServiceInfo.java
View File

@@ -114,7 +114,7 @@ public final class ApduServiceInfo implements Parcelable {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
public ApduServiceInfo(ResolveInfo info, String description, public ApduServiceInfo(ResolveInfo info, boolean onHost, String description,
ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups, ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups,
boolean requiresUnlock, int bannerResource, int uid, boolean requiresUnlock, int bannerResource, int uid,
String settingsActivityName, String offHost, String staticOffHost) { String settingsActivityName, String offHost, String staticOffHost) {
@@ -124,7 +124,7 @@ public final class ApduServiceInfo implements Parcelable {
this.mDynamicAidGroups = new HashMap<String, AidGroup>(); this.mDynamicAidGroups = new HashMap<String, AidGroup>();
this.mOffHostName = offHost; this.mOffHostName = offHost;
this.mStaticOffHostName = staticOffHost; this.mStaticOffHostName = staticOffHost;
this.mOnHost = (offHost == null); this.mOnHost = onHost;
this.mRequiresDeviceUnlock = requiresUnlock; this.mRequiresDeviceUnlock = requiresUnlock;
for (AidGroup aidGroup : staticAidGroups) { for (AidGroup aidGroup : staticAidGroups) {
this.mStaticAidGroups.put(aidGroup.category, aidGroup); this.mStaticAidGroups.put(aidGroup.category, aidGroup);
@@ -570,7 +570,7 @@ public final class ApduServiceInfo implements Parcelable {
int bannerResource = source.readInt(); int bannerResource = source.readInt();
int uid = source.readInt(); int uid = source.readInt();
String settingsActivityName = source.readString(); String settingsActivityName = source.readString();
return new ApduServiceInfo(info, description, staticAidGroups, return new ApduServiceInfo(info, onHost, description, staticAidGroups,
dynamicAidGroups, requiresUnlock, bannerResource, uid, dynamicAidGroups, requiresUnlock, bannerResource, uid,
settingsActivityName, offHostName, staticOffHostName); settingsActivityName, offHostName, staticOffHostName);
} }