[framework] Add getRoutingTable Oem extension API. (eaa60949) · Commits · e / os / android_frameworks_base

nfc/api/system-current.txt

+35 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ package android.nfc {
		method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void clearPreference();
		method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull public java.util.List<java.lang.String> getActiveNfceeList();
		method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public android.nfc.RoutingStatus getRoutingStatus();
		method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public java.util.List<android.nfc.NfcRoutingTableEntry> getRoutingTable();
		method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean hasUserEnabledNfc();
		method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean isAutoChangeEnabled();
		method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean isTagPresent();
		@@ -109,12 +110,46 @@ package android.nfc {
		method public void onTagDispatch(@NonNull java.util.function.Consumer<java.lang.Boolean>);
		}

		@FlaggedApi("android.nfc.nfc_oem_extension") public abstract class NfcRoutingTableEntry {
		method public int getNfceeId();
		}

		@FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingStatus {
		method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultIsoDepRoute();
		method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultOffHostRoute();
		method @FlaggedApi("android.nfc.nfc_oem_extension") @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int getDefaultRoute();
		}

		@FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingTableAidEntry extends android.nfc.NfcRoutingTableEntry {
		method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull public String getAid();
		}

		@FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingTableProtocolEntry extends android.nfc.NfcRoutingTableEntry {
		method @FlaggedApi("android.nfc.nfc_oem_extension") public int getProtocol();
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_ISO_DEP = 4; // 0x4
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_NDEF = 7; // 0x7
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_NFC_DEP = 5; // 0x5
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_T1T = 1; // 0x1
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_T2T = 2; // 0x2
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_T3T = 3; // 0x3
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_T5T = 6; // 0x6
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_UNDETERMINED = 0; // 0x0
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int PROTOCOL_UNSUPPORTED = -1; // 0xffffffff
		}

		@FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingTableSystemCodeEntry extends android.nfc.NfcRoutingTableEntry {
		method @FlaggedApi("android.nfc.nfc_oem_extension") @NonNull public byte[] getSystemCode();
		}

		@FlaggedApi("android.nfc.nfc_oem_extension") public class RoutingTableTechnologyEntry extends android.nfc.NfcRoutingTableEntry {
		method @FlaggedApi("android.nfc.nfc_oem_extension") public int getTechnology();
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_A = 0; // 0x0
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_B = 1; // 0x1
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_F = 2; // 0x2
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_UNSUPPORTED = -1; // 0xffffffff
		field @FlaggedApi("android.nfc.nfc_oem_extension") public static final int TECHNOLOGY_V = 3; // 0x3
		}

		}

		package android.nfc.cardemulation {

nfc/java/android/nfc/Entry.aidl

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.nfc;

		parcelable Entry;
		No newline at end of file

nfc/java/android/nfc/Entry.java

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.nfc;

		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;


		/** @hide */
		public final class Entry implements Parcelable {
		private final byte mType;
		private final byte mNfceeId;
		private final String mEntry;

		public Entry(String entry, byte type, byte nfceeId) {
		mEntry = entry;
		mType = type;
		mNfceeId = nfceeId;
		}

		public byte getType() {
		return mType;
		}

		public byte getNfceeId() {
		return mNfceeId;
		}

		public String getEntry() {
		return mEntry;
		}

		@Override
		public int describeContents() {
		return 0;
		}

		private Entry(Parcel in) {
		this.mEntry = in.readString();
		this.mNfceeId = in.readByte();
		this.mType = in.readByte();
		}

		public static final @NonNull Parcelable.Creator<Entry> CREATOR =
		new Parcelable.Creator<Entry>() {
		@Override
		public Entry createFromParcel(Parcel in) {
		return new Entry(in);
		}

		@Override
		public Entry[] newArray(int size) {
		return new Entry[size];
		}
		};

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeString(mEntry);
		dest.writeByte(mNfceeId);
		dest.writeByte(mType);
		}
		}

nfc/java/android/nfc/INfcAdapter.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.nfc;

		import android.app.PendingIntent;
		import android.content.IntentFilter;
		import android.nfc.Entry;
		import android.nfc.NdefMessage;
		import android.nfc.Tag;
		import android.nfc.TechListParcel;
		@@ -117,4 +118,5 @@ interface INfcAdapter
		void triggerInitialization();
		boolean getSettingStatus();
		boolean isTagPresent();
		List<Entry> getRoutingTableEntryList();
		}

nfc/java/android/nfc/NfcOemExtension.java

+39 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import android.util.Log;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.nio.charset.StandardCharsets;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;
		@@ -71,6 +72,11 @@ import java.util.function.Supplier;
		public final class NfcOemExtension {
		private static final String TAG = "NfcOemExtension";
		private static final int OEM_EXTENSION_RESPONSE_THRESHOLD_MS = 2000;
		private static final int TYPE_TECHNOLOGY = 0;
		private static final int TYPE_PROTOCOL = 1;
		private static final int TYPE_AID = 2;
		private static final int TYPE_SYSTEMCODE = 3;

		private final NfcAdapter mAdapter;
		private final NfcOemExtensionCallback mOemNfcExtensionCallback;
		private boolean mIsRegistered = false;
		@@ -680,6 +686,39 @@ public final class NfcOemExtension {
		));
		}

		/**
		* Gets current routing table entries.
		* @return List of {@link NfcRoutingTableEntry} representing current routing table
		*/
		@NonNull
		@RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
		@FlaggedApi(Flags.FLAG_NFC_OEM_EXTENSION)
		public List<NfcRoutingTableEntry> getRoutingTable() {
		List<Entry> entryList = NfcAdapter.callServiceReturn(() ->
		NfcAdapter.sService.getRoutingTableEntryList(), null);
		List<NfcRoutingTableEntry> result = new ArrayList<>();
		for (Entry entry : entryList) {
		switch (entry.getType()) {
		case TYPE_TECHNOLOGY -> result.add(
		new RoutingTableTechnologyEntry(entry.getNfceeId(),
		RoutingTableTechnologyEntry.techStringToInt(entry.getEntry()))
		);
		case TYPE_PROTOCOL -> result.add(
		new RoutingTableProtocolEntry(entry.getNfceeId(),
		RoutingTableProtocolEntry.protocolStringToInt(entry.getEntry()))
		);
		case TYPE_AID -> result.add(
		new RoutingTableAidEntry(entry.getNfceeId(), entry.getEntry())
		);
		case TYPE_SYSTEMCODE -> result.add(
		new RoutingTableSystemCodeEntry(entry.getNfceeId(),
		entry.getEntry().getBytes(StandardCharsets.UTF_8))
		);
		}
		}
		return result;
		}

		private final class NfcOemExtensionCallback extends INfcOemExtensionCallback.Stub {

		@Override