Merge "Adding a flag for improved wallet role icon and description fetching." into main (034418da) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10561,6 +10561,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 {

+8 −0

Original line number	Diff line number	Diff line
		@@ -241,3 +241,11 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		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"
		}

+23 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,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>
		* <service
		* android:apduServiceBanner="@drawable/product_logo"
		* android:label="@string/service_label"&gt
		* <property
		* android:name="android.content.PROPERTY_WALLET_ICON_AND_LABEL_HOLDER"
		* android:value="true"/>
		* &lt/service>
		* </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
		*/