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

Commit 90690d2a authored by Akinobu Nakashima's avatar Akinobu Nakashima Committed by Hiroki Yamamoto
Browse files

Fix backward compatibility when there's no secureElementName 

secureElementName can be unspecified in xml file.
If secureElementName is not specified, offHostName is null.
Then ApduServiceInfo#isOnHost returns true even if it is off-host
because mOnHost is wrongly set to true.

Test: manual
Bug: 137916987
Change-Id: I52ad1f09d3733fc435a937397fc9a433bd630a46
parent 268b4a3a

core/java/android/nfc/cardemulation/ApduServiceInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public final class ApduServiceInfo implements Parcelable { 
     * @hide

     */

    @UnsupportedAppUsage

    public ApduServiceInfo(ResolveInfo info, String description,

    public ApduServiceInfo(ResolveInfo info, boolean onHost, String description,

            ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups,

            boolean requiresUnlock, int bannerResource, int uid,

            String settingsActivityName, String offHost, String staticOffHost) {
@@ -124,7 +124,7 @@ public final class ApduServiceInfo implements Parcelable { 
        this.mDynamicAidGroups = new HashMap<String, AidGroup>();

        this.mOffHostName = offHost;

        this.mStaticOffHostName = staticOffHost;

        this.mOnHost = (offHost == null);

        this.mOnHost = onHost;

        this.mRequiresDeviceUnlock = requiresUnlock;

        for (AidGroup aidGroup : staticAidGroups) {

            this.mStaticAidGroups.put(aidGroup.category, aidGroup);
@@ -570,7 +570,7 @@ public final class ApduServiceInfo implements Parcelable { 
            int bannerResource = source.readInt();

            int uid = source.readInt();

            String settingsActivityName = source.readString();

            return new ApduServiceInfo(info, description, staticAidGroups,

            return new ApduServiceInfo(info, onHost, description, staticAidGroups,

                    dynamicAidGroups, requiresUnlock, bannerResource, uid,

                    settingsActivityName, offHostName, staticOffHostName);

        }