Merge "nfc(api): Expose formal APIs for APIs used by settings/sysui" into main... (ae768946) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+6 −0

core/java/android/nfc/NfcAdapter.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -378,6 +378,8 @@ public final class NfcAdapter {
	* <p>An external NFC field detected when device locked and SecureNfc enabled.		* <p>An external NFC field detected when device locked and SecureNfc enabled.
	* @hide		* @hide
	*/		*/
			@SystemApi
			@FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
	public static final String ACTION_REQUIRE_UNLOCK_FOR_NFC =		public static final String ACTION_REQUIRE_UNLOCK_FOR_NFC =
	"android.nfc.action.REQUIRE_UNLOCK_FOR_NFC";		"android.nfc.action.REQUIRE_UNLOCK_FOR_NFC";

	@@ -944,7 +946,8 @@ public final class NfcAdapter {
	*		*
	* @hide		* @hide
	*/		*/
	@UnsupportedAppUsage		@SystemApi
			@FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
	public int getAdapterState() {		public int getAdapterState() {
	try {		try {
	return sService.getState();		return sService.getState();

core/java/android/nfc/cardemulation/CardEmulation.java

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,17 +16,21 @@

	package android.nfc.cardemulation;		package android.nfc.cardemulation;

			import android.annotation.FlaggedApi;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.RequiresPermission;		import android.annotation.RequiresPermission;
	import android.annotation.SdkConstant;		import android.annotation.SdkConstant;
	import android.annotation.SdkConstant.SdkConstantType;		import android.annotation.SdkConstant.SdkConstantType;
			import android.annotation.SystemApi;
			import android.annotation.UserIdInt;
	import android.app.Activity;		import android.app.Activity;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	import android.nfc.Constants;		import android.nfc.Constants;
			import android.nfc.Flags;
	import android.nfc.INfcCardEmulation;		import android.nfc.INfcCardEmulation;
	import android.nfc.NfcAdapter;		import android.nfc.NfcAdapter;
	import android.os.RemoteException;		import android.os.RemoteException;
	@@ -877,9 +881,16 @@ public final class CardEmulation {
	}		}

	/**		/**
			* Retrieves list of services registered of the provided category for the provided user.
			*
			* @param category Category string, one of {@link #CATEGORY_PAYMENT} or {@link #CATEGORY_OTHER}
			* @param userId the user handle of the user whose information is being requested.
	* @hide		* @hide
	*/		*/
	public List<ApduServiceInfo> getServices(String category, int userId) {		@SystemApi
			@FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
			@NonNull
			public List<ApduServiceInfo> getServices(@NonNull String category, @UserIdInt int userId) {
	try {		try {
	return sService.getServices(userId, category);		return sService.getServices(userId, category);
	} catch (RemoteException e) {		} catch (RemoteException e) {

Original line number	Original line	Diff line number	Diff line
	@@ -10244,6 +10244,7 @@ package android.nfc {
	method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enable();		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enable();
	method @FlaggedApi("android.nfc.enable_nfc_reader_option") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableReaderOption(boolean);		method @FlaggedApi("android.nfc.enable_nfc_reader_option") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableReaderOption(boolean);
	method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableSecureNfc(boolean);		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableSecureNfc(boolean);
			method @FlaggedApi("android.nfc.enable_nfc_mainline") public int getAdapterState();
	method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public java.util.Map<java.lang.String,java.lang.Boolean> getTagIntentAppPreferenceForUser(int);		method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public java.util.Map<java.lang.String,java.lang.Boolean> getTagIntentAppPreferenceForUser(int);
	method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean isControllerAlwaysOn();		method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean isControllerAlwaysOn();
	method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean isControllerAlwaysOnSupported();		method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean isControllerAlwaysOnSupported();
	@@ -10254,6 +10255,7 @@ package android.nfc {
	method @FlaggedApi("android.nfc.enable_nfc_mainline") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setReaderMode(boolean);		method @FlaggedApi("android.nfc.enable_nfc_mainline") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setReaderMode(boolean);
	method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int setTagIntentAppPreferenceForUser(int, @NonNull String, boolean);		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int setTagIntentAppPreferenceForUser(int, @NonNull String, boolean);
	method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public void unregisterControllerAlwaysOnListener(@NonNull android.nfc.NfcAdapter.ControllerAlwaysOnListener);		method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public void unregisterControllerAlwaysOnListener(@NonNull android.nfc.NfcAdapter.ControllerAlwaysOnListener);
			field @FlaggedApi("android.nfc.enable_nfc_mainline") public static final String ACTION_REQUIRE_UNLOCK_FOR_NFC = "android.nfc.action.REQUIRE_UNLOCK_FOR_NFC";
	field public static final int TAG_INTENT_APP_PREF_RESULT_PACKAGE_NOT_FOUND = -1; // 0xffffffff		field public static final int TAG_INTENT_APP_PREF_RESULT_PACKAGE_NOT_FOUND = -1; // 0xffffffff
	field public static final int TAG_INTENT_APP_PREF_RESULT_SUCCESS = 0; // 0x0		field public static final int TAG_INTENT_APP_PREF_RESULT_SUCCESS = 0; // 0x0
	field public static final int TAG_INTENT_APP_PREF_RESULT_UNAVAILABLE = -2; // 0xfffffffe		field public static final int TAG_INTENT_APP_PREF_RESULT_UNAVAILABLE = -2; // 0xfffffffe
	@@ -10315,6 +10317,10 @@ package android.nfc.cardemulation {
	field @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public static final android.os.Parcelable.Creator<android.nfc.cardemulation.ApduServiceInfo> CREATOR;		field @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public static final android.os.Parcelable.Creator<android.nfc.cardemulation.ApduServiceInfo> CREATOR;
	}		}

			public final class CardEmulation {
			method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public java.util.List<android.nfc.cardemulation.ApduServiceInfo> getServices(@NonNull String, int);
			}

	@FlaggedApi("android.nfc.enable_nfc_mainline") public final class NfcFServiceInfo implements android.os.Parcelable {		@FlaggedApi("android.nfc.enable_nfc_mainline") public final class NfcFServiceInfo implements android.os.Parcelable {
	ctor @FlaggedApi("android.nfc.enable_nfc_mainline") public NfcFServiceInfo(@NonNull android.content.pm.PackageManager, @NonNull android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;		ctor @FlaggedApi("android.nfc.enable_nfc_mainline") public NfcFServiceInfo(@NonNull android.content.pm.PackageManager, @NonNull android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
	method @FlaggedApi("android.nfc.enable_nfc_mainline") public int describeContents();		method @FlaggedApi("android.nfc.enable_nfc_mainline") public int describeContents();