From 47bcb5a21a20ad59035ec4218e24cd45f1d49667 Mon Sep 17 00:00:00 2001
From: Yu Ping Hu <yph@google.com>
Date: Fri, 26 Jul 2013 16:09:49 -0700
Subject: [PATCH] Cleanup service loading.

Authenticator upgrading no longer uses the services file
to specify upgrades, so we can remove the fields associated
with that functionality.

Change-Id: I2122f18614d714a3d5a565fb4a6a547ddc010b6f
---
 res/values/attrs.xml                             |  2 --
 .../android/email/service/EmailServiceUtils.java | 16 ----------------
 2 files changed, 18 deletions(-)

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 728c00e99..bd6292462 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -26,7 +26,6 @@
         <attr name="name" format="string"/>
         <attr name="hide" format="boolean"/>
         <attr name="accountType" format="string"/>
-        <attr name="replaceWith" format="string"/>
         <attr name="serviceClass" format="string"/>
         <attr name="intent" format="string"/>
         <attr name="port" format="integer"/>
@@ -66,7 +65,6 @@
             <enum name="mins60" value="60"/>
         </attr>
         <attr name="inferPrefix" format="string"/>
-        <attr name="requiresAccountUpdate" format="boolean"/>
         <attr name="requiresSetup" format="boolean"/>
     </declare-styleable>
 </resources>
diff --git a/src/com/android/email/service/EmailServiceUtils.java b/src/com/android/email/service/EmailServiceUtils.java
index eebe5d936..f20498d23 100644
--- a/src/com/android/email/service/EmailServiceUtils.java
+++ b/src/com/android/email/service/EmailServiceUtils.java
@@ -175,7 +175,6 @@ public class EmailServiceUtils {
         public CharSequence[] syncIntervals;
         public int defaultSyncInterval;
         public String inferPrefix;
-        public boolean requiresAccountUpdate;
         public boolean offerLoadMore;
         public boolean requiresSetup;
         public boolean hide;
@@ -425,21 +424,6 @@ public class EmailServiceUtils {
                     final TypedArray ta = res.obtainAttributes(xml, R.styleable.EmailServiceInfo);
                     info.protocol = ta.getString(R.styleable.EmailServiceInfo_protocol);
                     info.accountType = ta.getString(R.styleable.EmailServiceInfo_accountType);
-                    // Protocol upgrades are handled by the upgrade broadcast receiver.
-                    // However, we still create the entry from the old protocol to the new type.
-                    // TODO: Remove the need for this entry.
-                    final String newProtocol =
-                            ta.getString(R.styleable.EmailServiceInfo_replaceWith);
-
-                    if (newProtocol != null) {
-                        final EmailServiceInfo newInfo = getServiceInfo(context, newProtocol);
-                        if (newInfo == null) {
-                            throw new IllegalStateException(
-                                    "Replacement service not found: " + newProtocol);
-                        }
-                        sServiceMap.put(info.protocol, newInfo);
-                        continue;
-                    }
                     info.name = ta.getString(R.styleable.EmailServiceInfo_name);
                     info.hide = ta.getBoolean(R.styleable.EmailServiceInfo_hide, false);
                     final String klass = ta.getString(R.styleable.EmailServiceInfo_serviceClass);