diff options
| author | 2023-11-17 20:22:16 +0000 | |
|---|---|---|
| committer | 2023-11-17 20:22:16 +0000 | |
| commit | cc36a901eff5bb44cc2c4056fb6c88a2991eaca2 (patch) | |
| tree | 736196abc97a401e1efd1f76fe40c885c0a49d77 | |
| parent | 39c4a124d4144870678c1af401d6f82321b28fe8 (diff) | |
| parent | 387035128caad357e208d9a665bc72e0a0e69607 (diff) | |
Merge "nfc(api): Restore constructor to previous version" into main
| -rw-r--r-- | core/java/android/nfc/cardemulation/ApduServiceInfo.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java index 597c948bd515..e331c95288d9 100644 --- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -21,6 +21,7 @@ package android.nfc.cardemulation; import android.annotation.FlaggedApi; +import android.compat.annotation.UnsupportedAppUsage; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; @@ -134,8 +135,9 @@ public final class ApduServiceInfo implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public ApduServiceInfo(ResolveInfo info, boolean onHost, String description, - List<AidGroup> staticAidGroups, List<AidGroup> dynamicAidGroups, + ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups, boolean requiresUnlock, int bannerResource, int uid, String settingsActivityName, String offHost, String staticOffHost) { this(info, onHost, description, staticAidGroups, dynamicAidGroups, @@ -147,7 +149,7 @@ public final class ApduServiceInfo implements Parcelable { * @hide */ public ApduServiceInfo(ResolveInfo info, boolean onHost, String description, - List<AidGroup> staticAidGroups, List<AidGroup> dynamicAidGroups, + ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups, boolean requiresUnlock, int bannerResource, int uid, String settingsActivityName, String offHost, String staticOffHost, boolean isEnabled) { |