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

Commit 2633b202 authored by Roshan Pius's avatar Roshan Pius
Browse files

nfc(api): Address API council feedback 

Rename from `isOtherServiceEnabled` to `isCategoryOtherServiceEnabled`.

Bug: 315130804
Test: Compiles
Change-Id: I7b97b6de0bd702e695557a4d55a1f80e612f92c8
parent ead78c5c

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -10303,8 +10303,8 @@ package android.nfc.cardemulation { 
    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public java.util.List<java.lang.String> getSubsetAids();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public int getUid();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean hasCategory(@NonNull String);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean isCategoryOtherServiceEnabled();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean isOnHost();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean isOtherServiceEnabled();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public CharSequence loadAppLabel(@NonNull android.content.pm.PackageManager);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public android.graphics.drawable.Drawable loadBanner(@NonNull android.content.pm.PackageManager);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public android.graphics.drawable.Drawable loadIcon(@NonNull android.content.pm.PackageManager);
@@ -10313,9 +10313,9 @@ package android.nfc.cardemulation { 
    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean requiresScreenOn();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public boolean requiresUnlock();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void resetOffHostSecureElement();

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setCategoryOtherServiceEnabled(boolean);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setDynamicAidGroup(@NonNull android.nfc.cardemulation.AidGroup);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setOffHostSecureElement(@NonNull String);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void setOtherServiceEnabled(boolean);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") public void writeToParcel(@NonNull android.os.Parcel, int);

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

  }

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

+10 −10
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public final class ApduServiceInfo implements Parcelable { 
    /**

     * State of the service for CATEGORY_OTHER selection

     */

    private boolean mOtherServiceEnabled;

    private boolean mCategoryOtherServiceEnabled;



    /**

     * @hide
@@ -183,7 +183,7 @@ public final class ApduServiceInfo implements Parcelable { 
        this.mBannerResourceId = bannerResource;

        this.mUid = uid;

        this.mSettingsActivityName = settingsActivityName;

        this.mOtherServiceEnabled = isEnabled;

        this.mCategoryOtherServiceEnabled = isEnabled;



    }
@@ -374,7 +374,7 @@ public final class ApduServiceInfo implements Parcelable { 
        // Set uid

        mUid = si.applicationInfo.uid;



        mOtherServiceEnabled = false;    // support other category

        mCategoryOtherServiceEnabled = false;    // support other category



    }
@@ -746,7 +746,7 @@ public final class ApduServiceInfo implements Parcelable { 
        dest.writeInt(mUid);

        dest.writeString(mSettingsActivityName);



        dest.writeInt(mOtherServiceEnabled ? 1 : 0);

        dest.writeInt(mCategoryOtherServiceEnabled ? 1 : 0);

    };



    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
@@ -809,7 +809,7 @@ public final class ApduServiceInfo implements Parcelable { 
        pw.println("    Static AID groups:");

        for (AidGroup group : mStaticAidGroups.values()) {

            pw.println("        Category: " + group.getCategory()

                    + "(enabled: " + mOtherServiceEnabled + ")");

                    + "(enabled: " + mCategoryOtherServiceEnabled + ")");

            for (String aid : group.getAids()) {

                pw.println("            AID: " + aid);

            }
@@ -817,7 +817,7 @@ public final class ApduServiceInfo implements Parcelable { 
        pw.println("    Dynamic AID groups:");

        for (AidGroup group : mDynamicAidGroups.values()) {

            pw.println("        Category: " + group.getCategory()

                    + "(enabled: " + mOtherServiceEnabled + ")");

                    + "(enabled: " + mCategoryOtherServiceEnabled + ")");

            for (String aid : group.getAids()) {

                pw.println("            AID: " + aid);

            }
@@ -834,8 +834,8 @@ public final class ApduServiceInfo implements Parcelable { 
     * @param enabled true to indicate if user has enabled this service

     */

    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)

    public void setOtherServiceEnabled(boolean enabled) {

        mOtherServiceEnabled = enabled;

    public void setCategoryOtherServiceEnabled(boolean enabled) {

        mCategoryOtherServiceEnabled = enabled;

    }
@@ -845,8 +845,8 @@ public final class ApduServiceInfo implements Parcelable { 
     * @return true to indicate if user has enabled this service

     */

    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)

    public boolean isOtherServiceEnabled() {

        return mOtherServiceEnabled;

    public boolean isCategoryOtherServiceEnabled() {

        return mCategoryOtherServiceEnabled;

    }



    /**