commit 8432b27a6b18457e2d30a0d20f1492930797fd21
author Debashish Chatterjee <debashishc@google.com> Mon Jul 18 05:31:03 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 18 05:31:03 2011 -0700
tree 2786b6f439e4a9b4ceb90408286933083d45e384
parent dd1aea0ca475c12266cc87950c2fbb9a57308ae5
parent ccbccde9cf094470118201091d8cc116cfcff725

Merge "Made voicemail status query from calllogfragment asynchronous."

src/com/android/contacts/calllog/CallLogFragment.java

diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index 0f95700..1b5fcb2 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -37,9 +37,6 @@
 import android.content.res.Resources;
 import android.database.CharArrayBuffer;
 import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabaseCorruptException;
-import android.database.sqlite.SQLiteDiskIOException;
-import android.database.sqlite.SQLiteFullException;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -1146,8 +1143,10 @@
         } else {
             // If there is a single item, use the direct URI for it.
             intent.setData(ContentUris.withAppendedId(Calls.CONTENT_URI_WITH_VOICEMAIL, id));
-            intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_URI,
-                    Uri.parse(cursor.getString(CallLogQuery.VOICEMAIL_URI)));
+            String voicemailUri = cursor.getString(CallLogQuery.VOICEMAIL_URI);
+            if (voicemailUri != null) {
+                intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_URI, Uri.parse(voicemailUri));
+            }
             intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_START_PLAYBACK, false);
         }
         startActivity(intent);

tests/src/com/android/contacts/activities/CallLogActivityTests.java

diff --git a/tests/src/com/android/contacts/activities/CallLogActivityTests.java b/tests/src/com/android/contacts/activities/CallLogActivityTests.java
index 8900c5e..ef029fc 100644
--- a/tests/src/com/android/contacts/activities/CallLogActivityTests.java
+++ b/tests/src/com/android/contacts/activities/CallLogActivityTests.java
@@ -54,8 +54,6 @@
 @LargeTest
 public class CallLogActivityTests
         extends ActivityInstrumentationTestCase2<CallLogActivity> {
-    private static final String TAG = "CallLogActivityTests";
-
     private static final String[] EXTENDED_CALL_LOG_PROJECTION = new String[] {
             Calls._ID,
             Calls.NUMBER,
@@ -63,6 +61,7 @@
             Calls.DURATION,
             Calls.TYPE,
             Calls.COUNTRY_ISO,
+            Calls.VOICEMAIL_URI,
             CallLogFragment.CallLogQuery.SECTION_NAME,
     };
     private static final int RAND_DURATION = -1;
@@ -431,6 +430,7 @@
         }
         row.add(type);  // type
         row.add(TEST_COUNTRY_ISO);  // country ISO
+        row.add(null);  // voicemail_uri
         row.add(CallLogFragment.CallLogQuery.SECTION_OLD_ITEM);  // section
     }