From 1310fb57905b300515b5c0f131afa0fdfe5a7fd8 Mon Sep 17 00:00:00 2001
From: Paul Westbrook <pwestbro@google.com>
Date: Mon, 11 Mar 2013 14:36:45 -0700
Subject: [PATCH] Remove extra Imap authenticator

Bug: 7211288
Change-Id: I130869a489fdfa95343022316a5ed4533d1f102c
---
 AndroidManifest.xml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2ef563592..9d4cea208 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -444,7 +444,7 @@
         <service
             android:name=".service.ImapAuthenticatorService"
             android:exported="true"
-            android:enabled="true"
+            android:enabled="false"
             >
             <intent-filter>
                 <action
@@ -572,20 +572,6 @@
                 android:resource="@xml/authenticator_alternate"
                 />
         </service>
-        <service
-            android:name=".service.ImapAuthenticatorService"
-            android:exported="true"
-            android:enabled="true"
-            >
-            <intent-filter>
-                <action
-                    android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator_imap"
-                />
-        </service>
 
         <service
             android:name=".service.LegacyImapAuthenticatorService"