Remove NFC CardEmulation dynamic resource APIs.

No longer needed.

Bug: 21343778
Change-Id: I5188c4bc819146861d346f3f4339f002b7173027

2 files changed, 2 insertions, 48 deletions

diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java
index 3d065e3..7678678 100644
--- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java
+++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java
@@ -92,11 +92,6 @@ public final class ApduServiceInfo implements Parcelable {
     final int mUid;
 
     /**
-     * Whether this service has dynamic resources
-     */
-    final boolean mHasDynamicResources;
-
-    /**
      * Settings Activity for this service
      */
     final String mSettingsActivityName;
@@ -106,7 +101,7 @@ public final class ApduServiceInfo implements Parcelable {
      */
     public ApduServiceInfo(ResolveInfo info, boolean onHost, String description,
             ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups,
-            boolean requiresUnlock, int bannerResource, int uid, boolean hasDynamicResources,
+            boolean requiresUnlock, int bannerResource, int uid,
             String settingsActivityName) {
         this.mService = info;
         this.mDescription = description;
@@ -122,7 +117,6 @@ public final class ApduServiceInfo implements Parcelable {
         }
         this.mBannerResourceId = bannerResource;
         this.mUid = uid;
-        this.mHasDynamicResources = hasDynamicResources;
         this.mSettingsActivityName = settingsActivityName;
     }
 
@@ -172,8 +166,6 @@ public final class ApduServiceInfo implements Parcelable {
                         false);
                 mBannerResourceId = sa.getResourceId(
                         com.android.internal.R.styleable.HostApduService_apduServiceBanner, -1);
-                mHasDynamicResources = sa.getBoolean(
-                        com.android.internal.R.styleable.HostApduService_dynamicResources, false);
                 mSettingsActivityName = sa.getString(
                         com.android.internal.R.styleable.HostApduService_settingsActivity);
                 sa.recycle();
@@ -186,8 +178,6 @@ public final class ApduServiceInfo implements Parcelable {
                 mRequiresDeviceUnlock = false;
                 mBannerResourceId = sa.getResourceId(
                         com.android.internal.R.styleable.OffHostApduService_apduServiceBanner, -1);
-                mHasDynamicResources = sa.getBoolean(
-                        com.android.internal.R.styleable.OffHostApduService_dynamicResources, false);
                 mSettingsActivityName = sa.getString(
                         com.android.internal.R.styleable.HostApduService_settingsActivity);
                 sa.recycle();
@@ -410,9 +400,6 @@ public final class ApduServiceInfo implements Parcelable {
             return null;
         }
     }
-    public boolean hasDynamicResources() {
-        return mHasDynamicResources;
-    }
 
     public String getSettingsActivityName() { return mSettingsActivityName; }
 
@@ -468,7 +455,6 @@ public final class ApduServiceInfo implements Parcelable {
         dest.writeInt(mRequiresDeviceUnlock ? 1 : 0);
         dest.writeInt(mBannerResourceId);
         dest.writeInt(mUid);
-        dest.writeInt(mHasDynamicResources ? 1 : 0);
         dest.writeString(mSettingsActivityName);
     };
 
@@ -492,10 +478,9 @@ public final class ApduServiceInfo implements Parcelable {
             boolean requiresUnlock = source.readInt() != 0;
             int bannerResource = source.readInt();
             int uid = source.readInt();
-            boolean dynamicResources = source.readInt() != 0;
             String settingsActivityName = source.readString();
             return new ApduServiceInfo(info, onHost, description, staticAidGroups,
-                    dynamicAidGroups, requiresUnlock, bannerResource, uid, dynamicResources,
+                    dynamicAidGroups, requiresUnlock, bannerResource, uid,
                     settingsActivityName);
         }
 
diff --git a/core/java/android/nfc/cardemulation/CardEmulation.java b/core/java/android/nfc/cardemulation/CardEmulation.java
index b94d4a6..64c2bc2 100644
--- a/core/java/android/nfc/cardemulation/CardEmulation.java
+++ b/core/java/android/nfc/cardemulation/CardEmulation.java
@@ -90,37 +90,6 @@ public final class CardEmulation {
     public static final String CATEGORY_OTHER = "other";
 
     /**
-     * Ordered broadcast that can be sent to your app to
-     * request a description and banner to be shown in
-     * Android Settings UI.
-     * When sent to you, this broadcast will contain the
-     * {@link #EXTRA_SERVICE_COMPONENT} extra to identify
-     * the service.
-     *
-     * Note that this broadcast will only be sent to your
-     * app, if a card emulation service in your app has requested
-     * its resources to be loaded dynamically.
-     */
-    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
-    public static final String ACTION_REQUEST_SERVICE_RESOURCES =
-            "android.nfc.cardemulation.action.REQUEST_SERVICE_RESOURCES";
-
-    /**
-     * The description of the service. Note that this must
-     * be localized by your app, as the String will be shown
-     * as is.
-     */
-    public static final String EXTRA_DESCRIPTION =
-            "android.nfc.cardemulation.extra.DESCRIPTION";
-
-    /**
-     * The resource ID of the service banner to be shown
-     * for this service.
-     */
-    public static final String EXTRA_BANNER_RES_ID =
-            "android.nfc.cardemulation.extra.BANNER_RES_ID";
-
-    /**
      * Return value for {@link #getSelectionModeForCategory(String)}.
      *
      * <p>In this mode, the user has set a default service for this