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

Commit 53f9a60d authored by Akinobu Nakashima's avatar Akinobu Nakashima Committed by android-build-merger
Browse files

Merge "Fix backward compatibility when there's no secureElementName" am: 24ae670b 

am: f1891778

Change-Id: I1f182bf2655e2ece7a28a9cdef4aa98339ab41b6
parents 0dc0325d f1891778

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);

        }