diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-01-12 15:47:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-12 15:47:00 -0800 |
| commit | 4a4b6e0d4646a0a4bc3cfa76cb37b4c6876dedbf (patch) | |
| tree | 5f75d60764b896408269582e7610ab5797110326 /core/java | |
| parent | b9c56e39689e650afcebed4da38ad79c7b6cfcdf (diff) | |
| parent | 9030dd125a18bcf630c784d695a6d5ee132a7081 (diff) | |
| download | frameworks_base-4a4b6e0d4646a0a4bc3cfa76cb37b4c6876dedbf.zip frameworks_base-4a4b6e0d4646a0a4bc3cfa76cb37b4c6876dedbf.tar.gz frameworks_base-4a4b6e0d4646a0a4bc3cfa76cb37b4c6876dedbf.tar.bz2 | |
Merge "Handle null correctly."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/pim/vcard/VCardParser_V21.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/pim/vcard/VCardParser_V21.java b/core/java/android/pim/vcard/VCardParser_V21.java index e7c19cf..c2928cb 100644 --- a/core/java/android/pim/vcard/VCardParser_V21.java +++ b/core/java/android/pim/vcard/VCardParser_V21.java @@ -110,11 +110,11 @@ public class VCardParser_V21 extends VCardParser { private long mTimeHandleBase64; public VCardParser_V21() { - this(VCardConfig.PARSE_TYPE_UNKNOWN); + this(null); } public VCardParser_V21(VCardSourceDetector detector) { - this(detector.getEstimatedType()); + this(detector != null ? detector.getEstimatedType() : VCardConfig.PARSE_TYPE_UNKNOWN); } public VCardParser_V21(int parseType) { |