Merge "Rename ApduServiceInfo.shareRolePriority()" into main (5c8c9521) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1506,7 +1506,6 @@ package android {
		field public static final int shadowRadius = 16843108; // 0x1010164
		field public static final int shape = 16843162; // 0x101019a
		field public static final int shareInterpolator = 16843195; // 0x10101bb
		field @FlaggedApi("android.nfc.nfc_associated_role_services") public static final int shareRolePriority;
		field @Deprecated public static final int sharedUserId = 16842763; // 0x101000b
		field @Deprecated public static final int sharedUserLabel = 16843361; // 0x1010261
		field public static final int sharedUserMaxSdkVersion = 16844365; // 0x101064d
		@@ -1871,6 +1870,7 @@ package android {
		field public static final int wallpaperIntraOpenExitAnimation = 16843416; // 0x1010298
		field public static final int wallpaperOpenEnterAnimation = 16843411; // 0x1010293
		field public static final int wallpaperOpenExitAnimation = 16843412; // 0x1010294
		field @FlaggedApi("android.nfc.nfc_associated_role_services") public static final int wantsRoleHolderPriority;
		field public static final int webTextViewStyle = 16843449; // 0x10102b9
		field public static final int webViewStyle = 16842885; // 0x1010085
		field public static final int weekDayTextAppearance = 16843592; // 0x1010348

+1 −1

Original line number	Diff line number	Diff line
		@@ -10977,8 +10977,8 @@ package android.nfc.cardemulation {
		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.nfc_observe_mode") public void setShouldDefaultToObserveMode(boolean);
		method @FlaggedApi("android.nfc.nfc_associated_role_services") public boolean shareRolePriority();
		method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean shouldDefaultToObserveMode();
		method @FlaggedApi("android.nfc.nfc_associated_role_services") public boolean wantsRoleHolderPriority();
		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";

+2 −2

Original line number	Diff line number	Diff line
		@@ -4641,7 +4641,7 @@
		role owner must opt into this behavior by using the property named by
		{@link android.nfc.cardemulation.CardEmulation.PROPERTY_ALLOW_SHARED_ROLE_PRIORITY }
		in the <code><application&rt;</code> tag. -->
		<attr name="shareRolePriority" format="boolean"/>
		<attr name="wantsRoleHolderPriority" format="boolean"/>
		</declare-styleable>

		<!-- Use <code>offhost-apdu-service</code> as the root tag of the XML resource that
		@@ -4669,7 +4669,7 @@
		<!-- Whether the device should default to observe mode when this service is
		default or in the foreground. -->
		<attr name="shouldDefaultToObserveMode"/>
		<attr name="shareRolePriority"/>
		<attr name="wantsRoleHolderPriority"/>
		</declare-styleable>

		<!-- Specify one or more <code>aid-group</code> elements inside a

+1 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@
		<!-- @FlaggedApi(android.content.pm.Flags.FLAG_APP_COMPAT_OPTION_16KB) -->
		<public name="pageSizeCompat" />
		<!-- @FlaggedApi(android.nfc.Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES) -->
		<public name="shareRolePriority"/>
		<public name="wantsRoleHolderPriority"/>
		<!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) -->
		<public name="minSdkVersionFull"/>
		</staging-public-group>

+7 −7

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ public final class ApduServiceInfo implements Parcelable {
		* Whether or not this service wants to share the same routing priority as the
		* Wallet role owner.
		*/
		private boolean mShareRolePriority;
		private boolean mWantsRoleHolderPriority;

		/**
		* @hide
		@@ -314,8 +314,8 @@ public final class ApduServiceInfo implements Parcelable {
		R.styleable.HostApduService_shouldDefaultToObserveMode,
		false);
		if (Flags.nfcAssociatedRoleServices()) {
		mShareRolePriority = sa.getBoolean(
		R.styleable.HostApduService_shareRolePriority,
		mWantsRoleHolderPriority = sa.getBoolean(
		R.styleable.HostApduService_wantsRoleHolderPriority,
		false
		);
		}
		@@ -350,8 +350,8 @@ public final class ApduServiceInfo implements Parcelable {
		}
		mStaticOffHostName = mOffHostName;
		if (Flags.nfcAssociatedRoleServices()) {
		mShareRolePriority = sa.getBoolean(
		R.styleable.OffHostApduService_shareRolePriority,
		mWantsRoleHolderPriority = sa.getBoolean(
		R.styleable.OffHostApduService_wantsRoleHolderPriority,
		false
		);
		}
		@@ -752,8 +752,8 @@ public final class ApduServiceInfo implements Parcelable {
		* @return whether or not this service wants to share priority
		*/
		@FlaggedApi(Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES)
		public boolean shareRolePriority() {
		return mShareRolePriority;
		public boolean wantsRoleHolderPriority() {
		return mWantsRoleHolderPriority;
		}

		/**