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

Commit b43c587e authored by Omer Ozer's avatar Omer Ozer Committed by Roshan Pius
Browse files

Adding a flag for improved wallet role icon 

and description fetching.

Bug: 349942654
Ignore-AOSP-First: Not releasing until 25q2
Test: manual adding the flag.
Flag: android.permission.flags.wallet_role_icon_property_enabled

Merged-In: I5f91668aca93fcba963e046b7f26345f40a0c6f3
Change-Id: I5f91668aca93fcba963e046b7f26345f40a0c6f3
parent c04c1151

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10467,6 +10467,7 @@ package android.nfc.cardemulation { 
    method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean shouldDefaultToObserveMode();

    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;

    field @FlaggedApi("android.permission.flags.wallet_role_icon_property_enabled") public static final String PROPERTY_WALLET_PREFERRED_BANNER_AND_LABEL = "android.nfc.cardemulation.PROPERTY_WALLET_PREFERRED_BANNER_AND_LABEL";

  }















  @FlaggedApi("android.nfc.enable_nfc_mainline") public final class NfcFServiceInfo implements android.os.Parcelable {

























core/java/android/permission/flags.aconfig



+8
−0




























Original line number
Diff line number
Diff line








@@ -231,3 +231,11 @@ flag {













    description: "This fixed read-only flag is used to enable new ranging permission for all ranging use cases."















    bug: "370977414"















}



























flag {













    name: "wallet_role_icon_property_enabled"













    is_exported: true













    namespace: "wallet_integration"













    description: "This flag is used to enabled the Wallet Role s icon fetching from manifest property"













    bug: "349942654"













}
























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



+23
−0




























Original line number
Diff line number
Diff line








@@ -70,6 +70,29 @@ import java.util.regex.Pattern;













public final class ApduServiceInfo implements Parcelable {















    private static final String TAG = "ApduServiceInfo";





























    /**













     * Component level {@link android.content.pm.PackageManager.Property PackageManager













     * .Property} for a system application to change its icon and label













     * on the default applications page. This property should be added to an













     * {@link HostApduService} declaration in the manifest.













     *













     * <p>For example:













     * <pre>













     * &lt;service













     *     android:apduServiceBanner="@drawable/product_logo"













     *     android:label="@string/service_label"&gt













     *      &lt;property













     *          android:name="android.content.PROPERTY_WALLET_ICON_AND_LABEL_HOLDER"













     *          android:value="true"/&gt;













     * &lt/service&gt;













     * </pre>













     * @hide













     */













    @SystemApi













    @FlaggedApi(android.permission.flags.Flags.FLAG_WALLET_ROLE_ICON_PROPERTY_ENABLED)













    public static final String PROPERTY_WALLET_PREFERRED_BANNER_AND_LABEL =













            "android.nfc.cardemulation.PROPERTY_WALLET_PREFERRED_BANNER_AND_LABEL";





























    /**















     * The service that implements this















     */