summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/hiddenapi-light-greylist.txt38
-rw-r--r--core/java/android/nfc/ErrorCodes.java3
-rw-r--r--core/java/android/nfc/NdefRecord.java2
-rw-r--r--core/java/android/nfc/NfcActivityManager.java2
-rw-r--r--core/java/android/nfc/NfcAdapter.java10
-rw-r--r--core/java/android/nfc/NfcManager.java2
-rw-r--r--core/java/android/nfc/Tag.java4
-rw-r--r--core/java/android/nfc/cardemulation/AidGroup.java10
-rw-r--r--core/java/android/nfc/cardemulation/ApduServiceInfo.java13
9 files changed, 46 insertions, 38 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt
index 314a92c8e3b8..dc633e521667 100644
--- a/config/hiddenapi-light-greylist.txt
+++ b/config/hiddenapi-light-greylist.txt
@@ -3483,29 +3483,6 @@ Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/wifi/WifiSsid;->getOctets()[B
Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String;
Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream;
-Landroid/nfc/cardemulation/AidGroup;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/nfc/cardemulation/AidGroup;->aids:Ljava/util/List;
-Landroid/nfc/cardemulation/AidGroup;->category:Ljava/lang/String;
-Landroid/nfc/cardemulation/AidGroup;->createFromXml(Lorg/xmlpull/v1/XmlPullParser;)Landroid/nfc/cardemulation/AidGroup;
-Landroid/nfc/cardemulation/AidGroup;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/nfc/cardemulation/AidGroup;->description:Ljava/lang/String;
-Landroid/nfc/cardemulation/AidGroup;->getAids()Ljava/util/List;
-Landroid/nfc/cardemulation/AidGroup;->getCategory()Ljava/lang/String;
-Landroid/nfc/cardemulation/AidGroup;->writeAsXml(Lorg/xmlpull/v1/XmlSerializer;)V
-Landroid/nfc/cardemulation/ApduServiceInfo;-><init>(Landroid/content/pm/PackageManager;Landroid/content/pm/ResolveInfo;Z)V
-Landroid/nfc/cardemulation/ApduServiceInfo;-><init>(Landroid/content/pm/ResolveInfo;ZLjava/lang/String;Ljava/util/ArrayList;Ljava/util/ArrayList;ZIILjava/lang/String;)V
-Landroid/nfc/cardemulation/ApduServiceInfo;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/nfc/cardemulation/ApduServiceInfo;->getDescription()Ljava/lang/String;
-Landroid/nfc/cardemulation/ApduServiceInfo;->getSettingsActivityName()Ljava/lang/String;
-Landroid/nfc/cardemulation/ApduServiceInfo;->getUid()I
-Landroid/nfc/cardemulation/ApduServiceInfo;->isOnHost()Z
-Landroid/nfc/cardemulation/ApduServiceInfo;->loadBanner(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable;
-Landroid/nfc/cardemulation/ApduServiceInfo;->mDynamicAidGroups:Ljava/util/HashMap;
-Landroid/nfc/cardemulation/ApduServiceInfo;->mService:Landroid/content/pm/ResolveInfo;
-Landroid/nfc/cardemulation/ApduServiceInfo;->mStaticAidGroups:Ljava/util/HashMap;
-Landroid/nfc/cardemulation/ApduServiceInfo;->requiresUnlock()Z
-Landroid/nfc/ErrorCodes;->isError(I)Z
-Landroid/nfc/INfcAdapter$Stub;->TRANSACTION_enable:I
Landroid/nfc/INfcAdapterExtras;->authenticate(Ljava/lang/String;[B)V
Landroid/nfc/INfcAdapterExtras;->close(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle;
Landroid/nfc/INfcAdapterExtras;->getCardEmulationRoute(Ljava/lang/String;)I
@@ -3513,21 +3490,6 @@ Landroid/nfc/INfcAdapterExtras;->getDriverName(Ljava/lang/String;)Ljava/lang/Str
Landroid/nfc/INfcAdapterExtras;->open(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle;
Landroid/nfc/INfcAdapterExtras;->setCardEmulationRoute(Ljava/lang/String;I)V
Landroid/nfc/INfcAdapterExtras;->transceive(Ljava/lang/String;[B)Landroid/os/Bundle;
-Landroid/nfc/NdefRecord;->mId:[B
-Landroid/nfc/NfcActivityManager;->mAdapter:Landroid/nfc/NfcAdapter;
-Landroid/nfc/NfcAdapter;->attemptDeadServiceRecovery(Ljava/lang/Exception;)V
-Landroid/nfc/NfcAdapter;->getAdapterState()I
-Landroid/nfc/NfcAdapter;->getContext()Landroid/content/Context;
-Landroid/nfc/NfcAdapter;->getDefaultAdapter()Landroid/nfc/NfcAdapter;
-Landroid/nfc/NfcAdapter;->getNfcAdapter(Landroid/content/Context;)Landroid/nfc/NfcAdapter;
-Landroid/nfc/NfcAdapter;->getNfcAdapterExtrasInterface()Landroid/nfc/INfcAdapterExtras;
-Landroid/nfc/NfcAdapter;->getService()Landroid/nfc/INfcAdapter;
-Landroid/nfc/NfcAdapter;->setNdefPushMessageCallback(Landroid/nfc/NfcAdapter$CreateNdefMessageCallback;Landroid/app/Activity;I)V
-Landroid/nfc/NfcAdapter;->sService:Landroid/nfc/INfcAdapter;
-Landroid/nfc/NfcManager;-><init>(Landroid/content/Context;)V
-Landroid/nfc/Tag;->getServiceHandle()I
-Landroid/nfc/Tag;->getTagService()Landroid/nfc/INfcTag;
-Landroid/nfc/Tag;->mId:[B
Landroid/opengl/EGL14;->eglGetDisplay(J)Landroid/opengl/EGLDisplay;
Landroid/opengl/GLES20;->glGetActiveAttrib(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V
Landroid/opengl/GLES20;->glGetActiveUniform(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V
diff --git a/core/java/android/nfc/ErrorCodes.java b/core/java/android/nfc/ErrorCodes.java
index 3adcdc378b77..98e31ad53be3 100644
--- a/core/java/android/nfc/ErrorCodes.java
+++ b/core/java/android/nfc/ErrorCodes.java
@@ -16,6 +16,8 @@
package android.nfc;
+import android.annotation.UnsupportedAppUsage;
+
/**
* This class defines all the error codes that can be returned by the service
* and producing an exception on the application level. These are needed since
@@ -25,6 +27,7 @@ package android.nfc;
*/
public class ErrorCodes {
+ @UnsupportedAppUsage
public static boolean isError(int code) {
if (code < 0) {
return true;
diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java
index 093a9b469cb8..b0090ca6bc32 100644
--- a/core/java/android/nfc/NdefRecord.java
+++ b/core/java/android/nfc/NdefRecord.java
@@ -16,6 +16,7 @@
package android.nfc;
+import android.annotation.UnsupportedAppUsage;
import android.content.Intent;
import android.net.Uri;
import android.os.Parcel;
@@ -279,6 +280,7 @@ public final class NdefRecord implements Parcelable {
private final short mTnf;
private final byte[] mType;
+ @UnsupportedAppUsage
private final byte[] mId;
private final byte[] mPayload;
diff --git a/core/java/android/nfc/NfcActivityManager.java b/core/java/android/nfc/NfcActivityManager.java
index 958063ae0a9f..abfa133a2f39 100644
--- a/core/java/android/nfc/NfcActivityManager.java
+++ b/core/java/android/nfc/NfcActivityManager.java
@@ -16,6 +16,7 @@
package android.nfc;
+import android.annotation.UnsupportedAppUsage;
import android.app.Activity;
import android.app.Application;
import android.content.ContentProvider;
@@ -45,6 +46,7 @@ public final class NfcActivityManager extends IAppCallback.Stub
static final String TAG = NfcAdapter.TAG;
static final Boolean DBG = false;
+ @UnsupportedAppUsage
final NfcAdapter mAdapter;
// All objects in the lists are protected by this
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java
index c3f23a1cca9f..21fed48189eb 100644
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -20,6 +20,7 @@ import android.annotation.RequiresPermission;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SystemApi;
+import android.annotation.UnsupportedAppUsage;
import android.app.Activity;
import android.app.ActivityThread;
import android.app.OnActivityPausedListener;
@@ -325,6 +326,7 @@ public final class NfcAdapter {
// Final after first constructor, except for
// attemptDeadServiceRecovery() when NFC crashes - we accept a best effort
// recovery
+ @UnsupportedAppUsage
static INfcAdapter sService;
static INfcTag sTagService;
static INfcCardEmulation sCardEmulationService;
@@ -490,6 +492,7 @@ public final class NfcAdapter {
* or throws if NFC is not available.
* @hide
*/
+ @UnsupportedAppUsage
public static synchronized NfcAdapter getNfcAdapter(Context context) {
if (!sIsInitialized) {
sHasNfcFeature = hasNfcFeature();
@@ -593,6 +596,7 @@ public final class NfcAdapter {
* @hide
*/
@Deprecated
+ @UnsupportedAppUsage
public static NfcAdapter getDefaultAdapter() {
// introduced in API version 9 (GB 2.3)
// deprecated in API version 10 (GB 2.3.3)
@@ -615,6 +619,7 @@ public final class NfcAdapter {
/**
* @hide
*/
+ @UnsupportedAppUsage
public Context getContext() {
return mContext;
}
@@ -623,6 +628,7 @@ public final class NfcAdapter {
* Returns the binder interface to the service.
* @hide
*/
+ @UnsupportedAppUsage
public INfcAdapter getService() {
isEnabled(); // NOP call to recover sService if it is stale
return sService;
@@ -676,6 +682,7 @@ public final class NfcAdapter {
* NFC service dead - attempt best effort recovery
* @hide
*/
+ @UnsupportedAppUsage
public void attemptDeadServiceRecovery(Exception e) {
Log.e(TAG, "NFC service dead - attempting to recover", e);
INfcAdapter service = getServiceInterface();
@@ -746,6 +753,7 @@ public final class NfcAdapter {
*
* @hide
*/
+ @UnsupportedAppUsage
public int getAdapterState() {
try {
return sService.getState();
@@ -1227,6 +1235,7 @@ public final class NfcAdapter {
/**
* @hide
*/
+ @UnsupportedAppUsage
public void setNdefPushMessageCallback(CreateNdefMessageCallback callback, Activity activity,
int flags) {
if (activity == null) {
@@ -1862,6 +1871,7 @@ public final class NfcAdapter {
/**
* @hide
*/
+ @UnsupportedAppUsage
public INfcAdapterExtras getNfcAdapterExtrasInterface() {
if (mContext == null) {
throw new UnsupportedOperationException("You need a context on NfcAdapter to use the "
diff --git a/core/java/android/nfc/NfcManager.java b/core/java/android/nfc/NfcManager.java
index 50d674570c14..71199c9c6257 100644
--- a/core/java/android/nfc/NfcManager.java
+++ b/core/java/android/nfc/NfcManager.java
@@ -17,6 +17,7 @@
package android.nfc;
import android.annotation.SystemService;
+import android.annotation.UnsupportedAppUsage;
import android.content.Context;
/**
@@ -44,6 +45,7 @@ public final class NfcManager {
/**
* @hide
*/
+ @UnsupportedAppUsage
public NfcManager(Context context) {
NfcAdapter adapter;
context = context.getApplicationContext();
diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java
index 154d5a11db9e..ce684cfea180 100644
--- a/core/java/android/nfc/Tag.java
+++ b/core/java/android/nfc/Tag.java
@@ -16,6 +16,7 @@
package android.nfc;
+import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.nfc.tech.IsoDep;
import android.nfc.tech.MifareClassic;
@@ -110,6 +111,7 @@ import java.util.HashMap;
* <p>
*/
public final class Tag implements Parcelable {
+ @UnsupportedAppUsage
final byte[] mId;
final int[] mTechList;
final String[] mTechStringList;
@@ -235,6 +237,7 @@ public final class Tag implements Parcelable {
* For use by NfcService only.
* @hide
*/
+ @UnsupportedAppUsage
public int getServiceHandle() {
return mServiceHandle;
}
@@ -355,6 +358,7 @@ public final class Tag implements Parcelable {
}
/** @hide */
+ @UnsupportedAppUsage
public INfcTag getTagService() {
return mTagService;
}
diff --git a/core/java/android/nfc/cardemulation/AidGroup.java b/core/java/android/nfc/cardemulation/AidGroup.java
index 78a9401a2abd..63776c4f397a 100644
--- a/core/java/android/nfc/cardemulation/AidGroup.java
+++ b/core/java/android/nfc/cardemulation/AidGroup.java
@@ -24,6 +24,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
+import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.Log;
@@ -45,8 +46,11 @@ public final class AidGroup implements Parcelable {
static final String TAG = "AidGroup";
+ @UnsupportedAppUsage
final List<String> aids;
+ @UnsupportedAppUsage
final String category;
+ @UnsupportedAppUsage
final String description;
/**
@@ -79,6 +83,7 @@ public final class AidGroup implements Parcelable {
this.description = null;
}
+ @UnsupportedAppUsage
AidGroup(String category, String description) {
this.aids = new ArrayList<String>();
this.category = category;
@@ -88,6 +93,7 @@ public final class AidGroup implements Parcelable {
/**
* @return the category of this AID group
*/
+ @UnsupportedAppUsage
public String getCategory() {
return category;
}
@@ -95,6 +101,7 @@ public final class AidGroup implements Parcelable {
/**
* @return the list of AIDs in this group
*/
+ @UnsupportedAppUsage
public List<String> getAids() {
return aids;
}
@@ -124,6 +131,7 @@ public final class AidGroup implements Parcelable {
}
}
+ @UnsupportedAppUsage
public static final Parcelable.Creator<AidGroup> CREATOR =
new Parcelable.Creator<AidGroup>() {
@@ -144,6 +152,7 @@ public final class AidGroup implements Parcelable {
}
};
+ @UnsupportedAppUsage
static public AidGroup createFromXml(XmlPullParser parser) throws XmlPullParserException, IOException {
String category = null;
ArrayList<String> aids = new ArrayList<String>();
@@ -185,6 +194,7 @@ public final class AidGroup implements Parcelable {
return group;
}
+ @UnsupportedAppUsage
public void writeAsXml(XmlSerializer out) throws IOException {
out.startTag(null, "aid-group");
out.attribute(null, "category", category);
diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java
index 218e4f223549..e8d801c525e9 100644
--- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java
+++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java
@@ -16,6 +16,7 @@
package android.nfc.cardemulation;
+import android.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -54,6 +55,7 @@ public final class ApduServiceInfo implements Parcelable {
/**
* The service that implements this
*/
+ @UnsupportedAppUsage
final ResolveInfo mService;
/**
@@ -69,11 +71,13 @@ public final class ApduServiceInfo implements Parcelable {
/**
* Mapping from category to static AID group
*/
+ @UnsupportedAppUsage
final HashMap<String, AidGroup> mStaticAidGroups;
/**
* Mapping from category to dynamic AID group
*/
+ @UnsupportedAppUsage
final HashMap<String, AidGroup> mDynamicAidGroups;
/**
@@ -99,6 +103,7 @@ public final class ApduServiceInfo implements Parcelable {
/**
* @hide
*/
+ @UnsupportedAppUsage
public ApduServiceInfo(ResolveInfo info, boolean onHost, String description,
ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups,
boolean requiresUnlock, int bannerResource, int uid,
@@ -120,6 +125,7 @@ public final class ApduServiceInfo implements Parcelable {
this.mSettingsActivityName = settingsActivityName;
}
+ @UnsupportedAppUsage
public ApduServiceInfo(PackageManager pm, ResolveInfo info, boolean onHost) throws
XmlPullParserException, IOException {
ServiceInfo si = info.serviceInfo;
@@ -374,18 +380,22 @@ public final class ApduServiceInfo implements Parcelable {
return (mStaticAidGroups.containsKey(category) || mDynamicAidGroups.containsKey(category));
}
+ @UnsupportedAppUsage
public boolean isOnHost() {
return mOnHost;
}
+ @UnsupportedAppUsage
public boolean requiresUnlock() {
return mRequiresDeviceUnlock;
}
+ @UnsupportedAppUsage
public String getDescription() {
return mDescription;
}
+ @UnsupportedAppUsage
public int getUid() {
return mUid;
}
@@ -411,6 +421,7 @@ public final class ApduServiceInfo implements Parcelable {
return mService.loadIcon(pm);
}
+ @UnsupportedAppUsage
public Drawable loadBanner(PackageManager pm) {
Resources res;
try {
@@ -426,6 +437,7 @@ public final class ApduServiceInfo implements Parcelable {
}
}
+ @UnsupportedAppUsage
public String getSettingsActivityName() { return mSettingsActivityName; }
@Override
@@ -483,6 +495,7 @@ public final class ApduServiceInfo implements Parcelable {
dest.writeString(mSettingsActivityName);
};
+ @UnsupportedAppUsage
public static final Parcelable.Creator<ApduServiceInfo> CREATOR =
new Parcelable.Creator<ApduServiceInfo>() {
@Override
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-11-02 01:25:08 +0000