ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't return a protocol for a null account type

Browse Source 
b/16735532

Change-Id: Ie83709fe3a9942ef946cf86f853b3d6565dc5799
This commit is contained in:
Tony Mantler 2014-08-07 15:36:20 -07:00
parent f1789afa53
commit 4c86584685
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/email/service/EmailServiceUtils.java
View File

@ -46,6 +46,7 @@ import android.provider.CalendarContract.SyncState;
import android.provider.ContactsContract;
import android.provider.ContactsContract.RawContacts;
import android.provider.SyncStateContract;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.android.email.R;
@ -651,8 +652,11 @@ public class EmailServiceUtils {
* @param accountType sync adapter service name
* @return protocol name or null
*/
public static String getProtocolFromAccountType(final Context context,
public static @Nullable String getProtocolFromAccountType(final Context context,
final String accountType) {
if (TextUtils.isEmpty(accountType)) {
return null;
}
final Map <String, EmailServiceInfo> serviceInfoMap = getServiceMap(context);
String protocol = null;
for (final EmailServiceInfo info : serviceInfoMap.values()) {