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

Commit 558940eb authored by Roshan Pius's avatar Roshan Pius
Browse files

nfc(api): Mark some data types as formal API for mainline 

These will be part of the platform (not part of NFC module) and will be
used by NFC stack to parse platform resource files to form these
structs.

Bug: 263563565
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:51c5d5ede5c85823fdd127fddc67d56da0defed0)
Merged-In: Ib1f22395567386a6e802d78b6fe359f92c3847d7

Change-Id: Ib1f22395567386a6e802d78b6fe359f92c3847d7
parent 9fb33563

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


aconfig_srcjars = [

    ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",

    ":android.nfc.flags-aconfig-java{.generated_srcjars}",

    ":android.os.flags-aconfig-java{.generated_srcjars}",

    ":android.security.flags-aconfig-java{.generated_srcjars}",

    ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",
@@ -110,6 +111,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// NFC

aconfig_declarations {

    name: "android.nfc.flags-aconfig",

    package: "android.nfc",

    srcs: ["core/java/android/nfc/*.aconfig"],

}



java_aconfig_library {

    name: "android.nfc.flags-aconfig-java",

    aconfig_declarations: "android.nfc.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Security

aconfig_declarations {

    name: "android.security.flags-aconfig",

core/api/system-current.txt

+67 −0
Original line number Diff line number Diff line
@@ -9140,6 +9140,73 @@ package android.nfc { 














}



























package android.nfc.cardemulation {

























  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public final class AidGroup implements android.os.Parcelable {













    ctor @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public AidGroup(@NonNull java.util.List<java.lang.String>, @Nullable String);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public static android.nfc.cardemulation.AidGroup createFromXml(@NonNull org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public int describeContents();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void dump(@NonNull android.util.proto.ProtoOutputStream);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public java.util.List<java.lang.String> getAids();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public String getCategory();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void writeAsXml(@NonNull org.xmlpull.v1.XmlSerializer) throws java.io.IOException;













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void writeToParcel(@NonNull android.os.Parcel, int);













    field @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public static final android.os.Parcelable.Creator<android.nfc.cardemulation.AidGroup> CREATOR;













  }

























  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public final class ApduServiceInfo implements android.os.Parcelable {













    ctor @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public ApduServiceInfo(@NonNull android.content.pm.PackageManager, @NonNull android.content.pm.ResolveInfo, boolean) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public int describeContents();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void dump(@NonNull android.os.ParcelFileDescriptor, @NonNull java.io.PrintWriter, @NonNull String[]);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void dumpDebug(@NonNull android.util.proto.ProtoOutputStream);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public java.util.List<android.nfc.cardemulation.AidGroup> getAidGroups();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public java.util.List<java.lang.String> getAids();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public String getCategoryForAid(@NonNull String);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.content.ComponentName getComponent();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public String getDescription();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.nfc.cardemulation.AidGroup getDynamicAidGroupForCategory(@NonNull String);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public String getOffHostSecureElement();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public java.util.List<java.lang.String> getPrefixAids();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public String getSettingsActivityName();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public java.util.List<java.lang.String> getSubsetAids();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public int getUid();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public boolean hasCategory(@NonNull String);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public boolean isOnHost();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public CharSequence loadAppLabel(@NonNull android.content.pm.PackageManager);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.graphics.drawable.Drawable loadBanner(@NonNull android.content.pm.PackageManager);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.graphics.drawable.Drawable loadIcon(@NonNull android.content.pm.PackageManager);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public CharSequence loadLabel(@NonNull android.content.pm.PackageManager);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public boolean removeDynamicAidGroupForCategory(@NonNull String);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public boolean requiresScreenOn();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public boolean requiresUnlock();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void resetOffHostSecureElement();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void setDynamicAidGroup(@NonNull android.nfc.cardemulation.AidGroup);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void setOffHostSecureElement(@NonNull String);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void writeToParcel(@NonNull android.os.Parcel, int);













    field @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public static final android.os.Parcelable.Creator<android.nfc.cardemulation.ApduServiceInfo> CREATOR;













  }

























  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public final class NfcFServiceInfo implements android.os.Parcelable {













    ctor @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public NfcFServiceInfo(@NonNull android.content.pm.PackageManager, @NonNull android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public int describeContents();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void dump(@NonNull android.os.ParcelFileDescriptor, @NonNull java.io.PrintWriter, @NonNull String[]);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void dumpDebug(@NonNull android.util.proto.ProtoOutputStream);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.content.ComponentName getComponent();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public String getDescription();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public String getNfcid2();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public String getSystemCode();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public String getT3tPmm();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public int getUid();













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.graphics.drawable.Drawable loadIcon(@NonNull android.content.pm.PackageManager);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public CharSequence loadLabel(@NonNull android.content.pm.PackageManager);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void setDynamicNfcid2(@NonNull String);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void setDynamicSystemCode(@NonNull String);













    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void writeToParcel(@NonNull android.os.Parcel, int);













    field @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public static final android.os.Parcelable.Creator<android.nfc.cardemulation.NfcFServiceInfo> CREATOR;













  }

























}



























package android.os {





























  public class BatteryManager {

























core/api/system-lint-baseline.txt



+13
−0




























Original line number
Diff line number
Diff line








@@ -225,3 +225,16 @@ SamShouldBeLast: android.view.accessibility.AccessibilityManager#addTouchExplora













    SAM-compatible parameters (such as parameter 1, "listener", in android.view.accessibility.AccessibilityManager.addTouchExplorationStateChangeListener) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions















SamShouldBeLast: android.webkit.WebChromeClient#onShowFileChooser(android.webkit.WebView, android.webkit.ValueCallback<android.net.Uri[]>, android.webkit.WebChromeClient.FileChooserParams):















    SAM-compatible parameters (such as parameter 2, "filePathCallback", in android.webkit.WebChromeClient.onShowFileChooser) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions



























UnflaggedApi: android.nfc.cardemulation.AidGroup#CONTENTS_FILE_DESCRIPTOR:













    New API must be flagged with @FlaggedApi: field android.nfc.cardemulation.AidGroup.CONTENTS_FILE_DESCRIPTOR













UnflaggedApi: android.nfc.cardemulation.AidGroup#PARCELABLE_WRITE_RETURN_VALUE:













    New API must be flagged with @FlaggedApi: field android.nfc.cardemulation.AidGroup.PARCELABLE_WRITE_RETURN_VALUE













UnflaggedApi: android.nfc.cardemulation.ApduServiceInfo#CONTENTS_FILE_DESCRIPTOR:













    New API must be flagged with @FlaggedApi: field android.nfc.cardemulation.ApduServiceInfo.CONTENTS_FILE_DESCRIPTOR













UnflaggedApi: android.nfc.cardemulation.ApduServiceInfo#PARCELABLE_WRITE_RETURN_VALUE:













    New API must be flagged with @FlaggedApi: field android.nfc.cardemulation.ApduServiceInfo.PARCELABLE_WRITE_RETURN_VALUE













UnflaggedApi: android.nfc.cardemulation.NfcFServiceInfo#CONTENTS_FILE_DESCRIPTOR:













    New API must be flagged with @FlaggedApi: field android.nfc.cardemulation.NfcFServiceInfo.CONTENTS_FILE_DESCRIPTOR













UnflaggedApi: android.nfc.cardemulation.NfcFServiceInfo#PARCELABLE_WRITE_RETURN_VALUE:













    New API must be flagged with @FlaggedApi: field android.nfc.cardemulation.NfcFServiceInfo.PARCELABLE_WRITE_RETURN_VALUE
























core/java/android/nfc/cardemulation/AidGroup.java



+86
−48




























Original line number
Diff line number
Diff line








@@ -16,7 +16,11 @@





























package android.nfc.cardemulation;





























import android.compat.annotation.UnsupportedAppUsage;













import android.annotation.FlaggedApi;













import android.annotation.NonNull;













import android.annotation.Nullable;













import android.annotation.SystemApi;













import android.nfc.Flags;















import android.os.Parcel;















import android.os.Parcelable;















import android.util.Log;









@@ -29,6 +33,11 @@ import org.xmlpull.v1.XmlSerializer;













import java.io.IOException;















import java.util.ArrayList;















import java.util.List;













import java.util.Locale;



























/**********************************************************************













 * This file is not a part of the NFC mainline module                 *













 * *******************************************************************/































/**















 * The AidGroup class represents a group of Application Identifiers (AIDs).









@@ -39,28 +48,30 @@ import java.util.List;













 *















 * @hide















 */













@SystemApi













@FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)















public final class AidGroup implements Parcelable {















    /**















     * The maximum number of AIDs that can be present in any one group.















     */













    public static final int MAX_NUM_AIDS = 256;













    private static final int MAX_NUM_AIDS = 256;



























    private static final String TAG = "AidGroup";





























    static final String TAG = "AidGroup";





























    @UnsupportedAppUsage













    final List<String> aids;













    @UnsupportedAppUsage













    final String category;













    @UnsupportedAppUsage













    final String description;













    private final List<String> mAids;













    private final String mCategory;













    @SuppressWarnings("unused") // Unused as of now, but part of the XML input.













    private final String mDescription;































    /**















     * Creates a new AidGroup object.















     *













     * @param aids The list of AIDs present in the group













     * @param category The category of this group, e.g. {@link CardEmulation#CATEGORY_PAYMENT}













     * @param aids list of AIDs present in the group













     * @param category category of this group, e.g. {@link CardEmulation#CATEGORY_PAYMENT}















     */













    public AidGroup(List<String> aids, String category) {













    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)













    public AidGroup(@NonNull List<String> aids, @Nullable String category) {















        if (aids == null || aids.size() == 0) {















            throw new IllegalArgumentException("No AIDS in AID group.");















        }









@@ -73,45 +84,55 @@ public final class AidGroup implements Parcelable {













            }















        }















        if (isValidCategory(category)) {













            this.category = category;













            this.mCategory = category;















        } else {













            this.category = CardEmulation.CATEGORY_OTHER;













            this.mCategory = CardEmulation.CATEGORY_OTHER;















        }













        this.aids = new ArrayList<String>(aids.size());













        this.mAids = new ArrayList<String>(aids.size());















        for (String aid : aids) {













            this.aids.add(aid.toUpperCase());













            this.mAids.add(aid.toUpperCase(Locale.US));















        }













        this.description = null;













        this.mDescription = null;















    }





























    @UnsupportedAppUsage













    AidGroup(String category, String description) {













        this.aids = new ArrayList<String>();













        this.category = category;













        this.description = description;













    /**













     * Creates a new AidGroup object.













     *













     * @param category category of this group, e.g. {@link CardEmulation#CATEGORY_PAYMENT}













     * @param description description of this group













     */













    AidGroup(@NonNull String category, @NonNull String description) {













        this.mAids = new ArrayList<String>();













        this.mCategory = category;













        this.mDescription = description;















    }































    /**













     * Returns the category of this group.















     * @return the category of this AID group















     */













    @UnsupportedAppUsage













    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)













    @NonNull















    public String getCategory() {













        return category;













        return mCategory;















    }































    /**













     * Returns the list of AIDs in this group.













     *















     * @return the list of AIDs in this group















     */













    @UnsupportedAppUsage













    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)













    @NonNull















    public List<String> getAids() {













        return aids;













        return mAids;















    }































    @Override















    public String toString() {













        StringBuilder out = new StringBuilder("Category: " + category +













                  ", AIDs:");













        for (String aid : aids) {













        StringBuilder out = new StringBuilder("Category: " + mCategory













                + ", AIDs:");













        for (String aid : mAids) {















            out.append(aid);















            out.append(", ");















        }









@@ -119,41 +140,44 @@ public final class AidGroup implements Parcelable {













    }































    /**













     * Dump debugging info as AidGroupProto













     * Dump debugging info as AidGroupProto.















     *















     * If the output belongs to a sub message, the caller is responsible for wrapping this function















     * between {@link ProtoOutputStream#start(long)} and {@link ProtoOutputStream#end(long)}.















     *















     * @param proto the ProtoOutputStream to write to















     */













    public void dump(ProtoOutputStream proto) {













        proto.write(AidGroupProto.CATEGORY, category);













        for (String aid : aids) {













    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)













    public void dump(@NonNull ProtoOutputStream proto) {













        proto.write(AidGroupProto.CATEGORY, mCategory);













        for (String aid : mAids) {















            proto.write(AidGroupProto.AIDS, aid);















        }















    }





























    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)















    @Override















    public int describeContents() {















        return 0;















    }





























    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)















    @Override













    public void writeToParcel(Parcel dest, int flags) {













        dest.writeString(category);













        dest.writeInt(aids.size());













        if (aids.size() > 0) {













            dest.writeStringList(aids);













    public void writeToParcel(@NonNull Parcel dest, int flags) {













        dest.writeString8(mCategory);













        dest.writeInt(mAids.size());













        if (mAids.size() > 0) {













            dest.writeStringList(mAids);















        }















    }





























    @UnsupportedAppUsage













    public static final @android.annotation.NonNull Parcelable.Creator<AidGroup> CREATOR =













    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)













    public static final @NonNull Parcelable.Creator<AidGroup> CREATOR =















            new Parcelable.Creator<AidGroup>() {































        @Override















        public AidGroup createFromParcel(Parcel source) {













            String category = source.readString();













            String category = source.readString8();















            int listSize = source.readInt();















            ArrayList<String> aidList = new ArrayList<String>();















            if (listSize > 0) {









@@ -168,8 +192,17 @@ public final class AidGroup implements Parcelable {













        }















    };





























    @UnsupportedAppUsage













    static public AidGroup createFromXml(XmlPullParser parser) throws XmlPullParserException, IOException {













    /**













     * Create an instance of AID group from XML file.













     *













     * @param parser input xml parser stream













     * @throws XmlPullParserException If an error occurs parsing the element.













     * @throws IOException If an error occurs reading the element.













     */













    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)













    @Nullable













    public static AidGroup createFromXml(@NonNull XmlPullParser parser)













            throws XmlPullParserException, IOException {















        String category = null;















        ArrayList<String> aids = new ArrayList<String>();















        AidGroup group = null;










@@ -210,11 +243,16 @@ public final class AidGroup implements Parcelable {













        return group;















    }





























    @UnsupportedAppUsage













    public void writeAsXml(XmlSerializer out) throws IOException {













    /**













     * Serialize instance of AID group to XML file.













     * @param out XML serializer stream













     * @throws IOException If an error occurs reading the element.













     */













    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)













    public void writeAsXml(@NonNull XmlSerializer out) throws IOException {















        out.startTag(null, "aid-group");













        out.attribute(null, "category", category);













        for (String aid : aids) {













        out.attribute(null, "category", mCategory);













        for (String aid : mAids) {















            out.startTag(null, "aid");















            out.attribute(null, "value", aid);















            out.endTag(null, "aid");









@@ -222,7 +260,7 @@ public final class AidGroup implements Parcelable {













        out.endTag(null, "aid-group");















    }





























    static boolean isValidCategory(String category) {













    private static boolean isValidCategory(String category) {















        return CardEmulation.CATEGORY_PAYMENT.equals(category) ||















                CardEmulation.CATEGORY_OTHER.equals(category);















    }

































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



+217
−71


























File changed.
Preview size limit exceeded, changes collapsed.