diff options
author | hmh <menghuai.huangorange@gmail.com> | 2015-01-28 15:21:37 +0800 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-02-11 21:59:41 -0800 |
commit | 179416cca7a13120c3a303de8dac084f78a25729 (patch) | |
tree | f98aafcca5b37b722881e5b60c82925fee1b3651 | |
parent | b155adc2a8441e81e6927e96ecc8955a7a828ba4 (diff) | |
download | android_packages_apps_Email-stable/cm-12.0-YNG1I.tar.gz android_packages_apps_Email-stable/cm-12.0-YNG1I.tar.bz2 android_packages_apps_Email-stable/cm-12.0-YNG1I.zip |
Fix crash issue when trying to setup an IMAP/POP3 accountstable/cm-12.0-YNG1I
Fix crash issue when trying to setup an IMAP/POP3
account. Issue 78699.
Change-Id: I6a09cf27d83edc17495bb1ab20a10e6994cf5506
Signed-off-by: HUANG Menghuai <menghuai.huange@orange.com>
-rwxr-xr-x | AndroidManifest.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 6 | ||||
-rw-r--r-- | res/xml/services.xml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ad6e4353d..b8abc6520 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -80,7 +80,7 @@ android:name=".EmailApplication" android:icon="@mipmap/ic_launcher_mail" android:label="@string/app_name" - android:requiredAccountType="com.android.exchange,com.android.email" + android:requiredAccountType="com.android.exchange,com.android.email.imap,com.android.email.pop3,com.android.email.legacy.imap" android:theme="@style/UnifiedEmailTheme" android:hardwareAccelerated="true" android:allowBackup="false" diff --git a/res/values/strings.xml b/res/values/strings.xml index 0e05b1f4e..fa680067e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -787,9 +787,9 @@ <string name="email_feedback_uri" translatable="false"></string> <string name="account_manager_type_exchange" translatable="false">com.android.exchange</string> - <string name="account_manager_type_pop3" translatable="false">com.android.email</string> - <string name="account_manager_type_imap" translatable="false">com.android.email</string> - <string name="account_manager_type_legacy_imap" translatable="false">com.android.email</string> + <string name="account_manager_type_pop3" translatable="false">com.android.email.pop3</string> + <string name="account_manager_type_imap" translatable="false">com.android.email.imap</string> + <string name="account_manager_type_legacy_imap" translatable="false">com.android.email.legacy.imap</string> <string name="intent_exchange_action" translatable="false">com.android.email.EXCHANGE_INTENT</string> <string name="intent_exchange_cert_action" translatable="false">com.android.email.EXCHANGE_REQUEST_CERT</string> <string name="intent_exchange_package" translatable="false">com.android.exchange</string> diff --git a/res/xml/services.xml b/res/xml/services.xml index 6059a6218..d3e381af2 100644 --- a/res/xml/services.xml +++ b/res/xml/services.xml @@ -70,7 +70,7 @@ <emailservice email:protocol="imap" email:name="@string/imap_name" - email:accountType="@string/account_manager_type_imap" + email:accountType="@string/account_manager_type_legacy_imap" email:serviceClass="com.android.email.service.ImapService" email:port="143" email:portSsl="993" |