diff options
3 files changed, 6 insertions, 8 deletions
diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java index e59aff08..3b937389 100644 --- a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java @@ -34,7 +34,6 @@ import android.test.mock.MockContentResolver; import android.util.Log; import com.google.mockwebserver.MockResponse; -import com.google.mockwebserver.MockStreamResponse; import com.google.mockwebserver.MockWebServer; import com.google.mockwebserver.RecordedRequest; import com.google.mockwebserver.SocketPolicy; @@ -221,10 +220,6 @@ public abstract class AbstractDownloadProviderFunctionalTest extends mServer.enqueue(resp); } - void enqueueResponse(MockStreamResponse resp) { - mServer.enqueue(resp); - } - MockResponse buildResponse(int status, String body) { return new MockResponse().setResponseCode(status).setBody(body) .setHeader("Content-type", "text/plain") diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java index b6fd611e..bde95815 100644 --- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java @@ -50,7 +50,6 @@ import android.test.suitebuilder.annotation.Suppress; import android.text.format.DateUtils; import com.google.mockwebserver.MockResponse; -import com.google.mockwebserver.MockStreamResponse; import com.google.mockwebserver.RecordedRequest; import com.google.mockwebserver.SocketPolicy; @@ -141,7 +140,7 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { final long length = 3 * GB_IN_BYTES; final InputStream body = new FakeInputStream(length); - enqueueResponse(new MockStreamResponse().setResponseCode(HTTP_OK).setBody(body, length) + enqueueResponse(new MockResponse().setResponseCode(HTTP_OK).setBody(body, length) .setHeader("Content-type", "text/plain") .setSocketPolicy(SocketPolicy.DISCONNECT_AT_END)); diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java index fd000d3c..05b5d757 100644 --- a/ui/src/com/android/providers/downloads/ui/DownloadList.java +++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java @@ -431,8 +431,10 @@ public class DownloadList extends Activity { if (mDateSortedCursor == null || mDateSortedCursor.getCount() == 0) { mEmptyView.setVisibility(View.VISIBLE); + mSortOption.setVisibility(View.GONE); } else { mEmptyView.setVisibility(View.GONE); + mSortOption.setVisibility(View.VISIBLE); ListView lv = activeListView(); lv.setVisibility(View.VISIBLE); lv.invalidateViews(); // ensure checkboxes get updated @@ -765,7 +767,9 @@ public class DownloadList extends Activity { // are all prefixes of the given mimetypes the same? ArrayList<String> mimeTypePrefixes = new ArrayList<String>(); for (String s : mimeTypes) { - mimeTypePrefixes.add(s.substring(0, s.indexOf('/'))); + if (s != null) { + mimeTypePrefixes.add(s.substring(0, s.indexOf('/'))); + } } str = findCommonString(mimeTypePrefixes); if (str != null) { |