Remove NFC CardEmulation dynamic resource APIs.

No longer needed.

Bug: 21343778
Change-Id: I5188c4bc819146861d346f3f4339f002b7173027

7 files changed, 7 insertions, 63 deletions

diff --git a/api/current.txt b/api/current.txt
index e1c83e5..22bb5ca 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -219,6 +219,7 @@ package android {
   public static final class R.attr {
     ctor public R.attr();
     field public static final int __reserved0 = 16844020; // 0x10104f4
+    field public static final int __reserved1 = 16844019; // 0x10104f3
     field public static final int absListViewStyle = 16842858; // 0x101006a
     field public static final int accessibilityEventTypes = 16843648; // 0x1010380
     field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
@@ -507,7 +508,6 @@ package android {
     field public static final int dropDownWidth = 16843362; // 0x1010262
     field public static final int duplicateParentState = 16842985; // 0x10100e9
     field public static final int duration = 16843160; // 0x1010198
-    field public static final int dynamicResources = 16844019; // 0x10104f3
     field public static final int editTextBackground = 16843602; // 0x1010352
     field public static final int editTextColor = 16843601; // 0x1010351
     field public static final int editTextPreferenceStyle = 16842898; // 0x1010092
@@ -19679,12 +19679,9 @@ package android.nfc.cardemulation {
     method public boolean supportsAidPrefixRegistration();
     method public boolean unsetPreferredService(android.app.Activity);
     field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT";
-    field public static final java.lang.String ACTION_REQUEST_SERVICE_RESOURCES = "android.nfc.cardemulation.action.REQUEST_SERVICE_RESOURCES";
     field public static final java.lang.String CATEGORY_OTHER = "other";
     field public static final java.lang.String CATEGORY_PAYMENT = "payment";
-    field public static final java.lang.String EXTRA_BANNER_RES_ID = "android.nfc.cardemulation.extra.BANNER_RES_ID";
     field public static final java.lang.String EXTRA_CATEGORY = "category";
-    field public static final java.lang.String EXTRA_DESCRIPTION = "android.nfc.cardemulation.extra.DESCRIPTION";
     field public static final java.lang.String EXTRA_SERVICE_COMPONENT = "component";
     field public static final int SELECTION_MODE_ALWAYS_ASK = 1; // 0x1
     field public static final int SELECTION_MODE_ASK_IF_CONFLICT = 2; // 0x2
diff --git a/api/system-current.txt b/api/system-current.txt
index 2839f68..6f4670a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -294,6 +294,7 @@ package android {
   public static final class R.attr {
     ctor public R.attr();
     field public static final int __reserved0 = 16844020; // 0x10104f4
+    field public static final int __reserved1 = 16844019; // 0x10104f3
     field public static final int absListViewStyle = 16842858; // 0x101006a
     field public static final int accessibilityEventTypes = 16843648; // 0x1010380
     field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
@@ -582,7 +583,6 @@ package android {
     field public static final int dropDownWidth = 16843362; // 0x1010262
     field public static final int duplicateParentState = 16842985; // 0x10100e9
     field public static final int duration = 16843160; // 0x1010198
-    field public static final int dynamicResources = 16844019; // 0x10104f3
     field public static final int editTextBackground = 16843602; // 0x1010352
     field public static final int editTextColor = 16843601; // 0x1010351
     field public static final int editTextPreferenceStyle = 16842898; // 0x1010092
@@ -21597,12 +21597,9 @@ package android.nfc.cardemulation {
     method public boolean supportsAidPrefixRegistration();
     method public boolean unsetPreferredService(android.app.Activity);
     field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT";
-    field public static final java.lang.String ACTION_REQUEST_SERVICE_RESOURCES = "android.nfc.cardemulation.action.REQUEST_SERVICE_RESOURCES";
     field public static final java.lang.String CATEGORY_OTHER = "other";
     field public static final java.lang.String CATEGORY_PAYMENT = "payment";
-    field public static final java.lang.String EXTRA_BANNER_RES_ID = "android.nfc.cardemulation.extra.BANNER_RES_ID";
     field public static final java.lang.String EXTRA_CATEGORY = "category";
-    field public static final java.lang.String EXTRA_DESCRIPTION = "android.nfc.cardemulation.extra.DESCRIPTION";
     field public static final java.lang.String EXTRA_SERVICE_COMPONENT = "component";
     field public static final int SELECTION_MODE_ALWAYS_ASK = 1; // 0x1
     field public static final int SELECTION_MODE_ASK_IF_CONFLICT = 2; // 0x2
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
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 439affe..8accc0a 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -232,7 +232,6 @@
 
     <protected-broadcast android:name="android.nfc.action.TRANSACTION_DETECTED" />
 
-    <protected-broadcast android:name="android.nfc.cardemulation.action.REQUEST_SERVICE_RESOURCES" />
     <protected-broadcast android:name="android.intent.action.CLEAR_DNS_CACHE" />
     <protected-broadcast android:name="android.intent.action.PROXY_CHANGE" />
 
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index a65c5c1..24c8d48 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -3225,8 +3225,6 @@
         <!-- A drawable that can be rendered in Android's system UI for representing
              the service. -->
         <attr name="apduServiceBanner" format="reference"/>
-        <!-- Allows the app to update the description and service banner at run-time -->
-        <attr name="dynamicResources" format="boolean"/>
         <!-- Component name of an activity that allows the user to modify
              the settings for this service. -->
         <attr name="settingsActivity"/>
@@ -3243,8 +3241,6 @@
         <!-- A drawable that can be rendered in Android's system UI for representing
              the service. -->
         <attr name="apduServiceBanner"/>
-        <!-- Allows the app to update the description and service banner at run-time -->
-        <attr name="dynamicResources"/>
         <!-- Component name of an activity that allows the user to modify
              the settings for this service. -->
         <attr name="settingsActivity"/>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 1600e97..ef39c75 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2679,8 +2679,9 @@
   <public type="attr" name="rightIndents" />
 
   <public type="attr" name="showForAllUsers" />
-  <!-- NFC CardEmulation: dynamically load service resources -->
-  <public type="attr" name="dynamicResources" />
+
+  <attr name="__reserved1" format="boolean" />
+  <public type="attr" name="__reserved1" />
 
   <attr name="__reserved0" format="boolean" />
   <public type="attr" name="__reserved0" />