From 2af7d01ef7ab48865b63a8b42797b2b8573db40c Mon Sep 17 00:00:00 2001
From: Paul Westbrook <pwestbro@google.com>
Date: Wed, 13 Mar 2013 00:24:02 +0000
Subject: [PATCH] Revert "Revert "Remove extra Imap authenticator""  :)

This reverts commit 8fcf4d797679d3f4b58ac6c3ccd987d21392de96

Change-Id: If5a83b82ec64b6acef7c9f1c7896ef144aacfd1f
---
 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"