Merge "Revert "Remove extra Imap authenticator"" into jb-ub-mail-ur9

This commit is contained in:
Paul Westbrook 2013-03-12 23:05:40 +00:00 committed by Android (Google) Code Review
commit e0cc62d72f

View File

@ -438,7 +438,7 @@
<service <service
android:name=".service.ImapAuthenticatorService" android:name=".service.ImapAuthenticatorService"
android:exported="true" android:exported="true"
android:enabled="false" android:enabled="true"
> >
<intent-filter> <intent-filter>
<action <action
@ -566,6 +566,20 @@
android:resource="@xml/authenticator_alternate" android:resource="@xml/authenticator_alternate"
/> />
</service> </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 <service
android:name=".service.LegacyImapAuthenticatorService" android:name=".service.LegacyImapAuthenticatorService"