Merge "Make defaultToObserveMode public" into main (1684475d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -687,6 +687,7 @@ package android {
		field public static final int defaultHeight = 16844021; // 0x10104f5
		field @FlaggedApi("android.content.res.default_locale") public static final int defaultLocale;
		field public static final int defaultToDeviceProtectedStorage = 16844036; // 0x1010504
		field @FlaggedApi("android.nfc.Flags.FLAG_OBSERVE_MODE") public static final int defaultToObserveMode;
		field public static final int defaultValue = 16843245; // 0x10101ed
		field public static final int defaultWidth = 16844020; // 0x10104f4
		field public static final int delay = 16843212; // 0x10101cc

core/api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -10239,6 +10239,7 @@ package android.nfc.cardemulation {
		ctor @FlaggedApi("android.nfc.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("android.nfc.nfc_read_polling_loop") public void addPollingLoopFilter(@NonNull String);
		method @FlaggedApi("android.nfc.nfc_read_polling_loop") public void addPollingLoopFilterToAutoTransact(@NonNull String);
		method @FlaggedApi("android.nfc.nfc_observe_mode") public boolean defaultToObserveMode();
		method @FlaggedApi("android.nfc.enable_nfc_mainline") public int describeContents();
		method @FlaggedApi("android.nfc.enable_nfc_mainline") public void dump(@NonNull android.os.ParcelFileDescriptor, @NonNull java.io.PrintWriter, @NonNull String[]);
		method @FlaggedApi("android.nfc.enable_nfc_mainline") public void dumpDebug(@NonNull android.util.proto.ProtoOutputStream);
		@@ -10268,6 +10269,7 @@ package android.nfc.cardemulation {
		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.nfc_observe_mode") public void setDefaultToObserveMode(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 writeToParcel(@NonNull android.os.Parcel, int);

core/res/res/values/public-staging.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,8 @@
		<public name="contentSensitivity" />
		<!-- @FlaggedApi("android.view.inputmethod.connectionless_handwriting") -->
		<public name="supportsConnectionlessStylusHandwriting" />
		<!-- @FlaggedApi("android.nfc.Flags.FLAG_OBSERVE_MODE") -->
		<public name="defaultToObserveMode"/>
		</staging-public-group>

		<staging-public-group type="id" first-id="0x01bc0000">

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

+32 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,8 @@ import android.util.Log;
		import android.util.Xml;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.R;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

		@@ -137,6 +139,11 @@ public final class ApduServiceInfo implements Parcelable {
		*/
		private boolean mCategoryOtherServiceEnabled;

		/**
		* Whether the NFC stack should default to Observe Mode when this preferred service.
		*/
		private boolean mDefaultToObserveMode;

		/**
		* @hide
		*/
		@@ -257,6 +264,9 @@ public final class ApduServiceInfo implements Parcelable {
		com.android.internal.R.styleable.HostApduService_settingsActivity);
		mOffHostName = null;
		mStaticOffHostName = mOffHostName;
		mDefaultToObserveMode = sa.getBoolean(
		R.styleable.HostApduService_defaultToObserveMode,
		false);
		sa.recycle();
		} else {
		TypedArray sa = res.obtainAttributes(attrs,
		@@ -276,6 +286,9 @@ public final class ApduServiceInfo implements Parcelable {
		com.android.internal.R.styleable.HostApduService_settingsActivity);
		mOffHostName = sa.getString(
		com.android.internal.R.styleable.OffHostApduService_secureElementName);
		mDefaultToObserveMode = sa.getBoolean(
		R.styleable.HostApduService_defaultToObserveMode,
		false);
		if (mOffHostName != null) {
		if (mOffHostName.equals("eSE")) {
		mOffHostName = "eSE1";
		@@ -610,6 +623,25 @@ public final class ApduServiceInfo implements Parcelable {
		return mRequiresDeviceScreenOn;
		}

		/**
		* Returns whether the NFC stack should default to observe mode when this servise is preferred.
		* @return whether the NFC stack should default to observe mode when this servise is preferred
		*/
		@FlaggedApi(Flags.FLAG_NFC_OBSERVE_MODE)
		public boolean defaultToObserveMode() {
		return mDefaultToObserveMode;
		}

		/**
		* Sets whether the NFC stack should default to observe mode when this servise is preferred.
		* @param defaultToObserveMode whether the NFC stack should default to observe mode when this
		* servise is preferred
		*/
		@FlaggedApi(Flags.FLAG_NFC_OBSERVE_MODE)
		public void setDefaultToObserveMode(boolean defaultToObserveMode) {
		mDefaultToObserveMode = defaultToObserveMode;
		}

		/**
		* Returns description of service.
		* @return user readable description of service