summaryrefslogtreecommitdiffstats
path: root/core/java/android/pim
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2009-11-04 11:41:50 +0900
committerDaisuke Miyakawa <dmiyakawa@google.com>2009-11-04 21:51:54 +0900
commitf035b47774aabf7397aec5c5459ac9860ad63bab (patch)
treeded2b5fc092dedacee20aeeb6254b0ac9b780b9e /core/java/android/pim
parent231e01e7922abae0b33f0aec95275a5cc1b0209d (diff)
downloadframeworks_base-f035b47774aabf7397aec5c5459ac9860ad63bab.zip
frameworks_base-f035b47774aabf7397aec5c5459ac9860ad63bab.tar.gz
frameworks_base-f035b47774aabf7397aec5c5459ac9860ad63bab.tar.bz2
Make test compontent support multiple vCard input.
Internal issue number: 2195990
Diffstat (limited to 'core/java/android/pim')
-rw-r--r--core/java/android/pim/vcard/VCardComposer.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java
index aff3831..b8f4cfd 100644
--- a/core/java/android/pim/vcard/VCardComposer.java
+++ b/core/java/android/pim/vcard/VCardComposer.java
@@ -392,7 +392,9 @@ public class VCardComposer {
* Must call before {{@link #init()}.
*/
public void addHandler(OneEntryHandler handler) {
- mHandlerList.add(handler);
+ if (handler != null) {
+ mHandlerList.add(handler);
+ }
}
/**
@@ -1865,11 +1867,11 @@ public class VCardComposer {
switch (typeAsPrimitive) {
case Phone.TYPE_HOME:
parameterList.addAll(
- Arrays.asList(Constants.PARAM_TYPE_HOME, Constants.PARAM_TYPE_VOICE));
+ Arrays.asList(Constants.PARAM_TYPE_HOME));
break;
case Phone.TYPE_WORK:
parameterList.addAll(
- Arrays.asList(Constants.PARAM_TYPE_WORK, Constants.PARAM_TYPE_VOICE));
+ Arrays.asList(Constants.PARAM_TYPE_WORK));
break;
case Phone.TYPE_FAX_HOME:
parameterList.addAll(