aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2017-02-14 02:33:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-14 02:33:44 +0000
commit085373253424bbe8dbf145100384ebab5d863c00 (patch)
treeb7659cfd744afeabcabeaf1a07458b1f53878b83
parentadbd814f32c2978189756c60098c7b50a21f5812 (diff)
parentdaf40d88db9e33bd32cca8622b26bdfd47acf103 (diff)
downloadTV-085373253424bbe8dbf145100384ebab5d863c00.tar.gz
Remove use of junit.framework.Assert in non-test code am: 2728397759 am: 57fc9514a7
am: daf40d88db Change-Id: I36e4e8c1a4de09bae0a33bdd401ce3ee3467bce9
-rw-r--r--src/com/android/tv/search/TvProviderSearch.java10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/com/android/tv/search/TvProviderSearch.java b/src/com/android/tv/search/TvProviderSearch.java
index 3804f2de..2ceec19a 100644
--- a/src/com/android/tv/search/TvProviderSearch.java
+++ b/src/com/android/tv/search/TvProviderSearch.java
@@ -38,8 +38,6 @@ import com.android.tv.search.LocalSearchProvider.SearchResult;
import com.android.tv.util.PermissionUtils;
import com.android.tv.util.Utils;
-import junit.framework.Assert;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -191,10 +189,6 @@ public class TvProviderSearch implements SearchInterface {
@WorkerThread
private List<SearchResult> searchChannels(String query, String[] columnForExactMatching,
String[] columnForPartialMatching, Set<Long> channelsFound, int limit) {
- Assert.assertTrue(
- (columnForExactMatching != null && columnForExactMatching.length > 0) ||
- (columnForPartialMatching != null && columnForPartialMatching.length > 0));
-
String[] projection = {
Channels._ID,
Channels.COLUMN_DISPLAY_NUMBER,
@@ -314,10 +308,6 @@ public class TvProviderSearch implements SearchInterface {
String[] columnForPartialMatching, Set<Long> channelsFound, int limit) {
if (DEBUG) Log.d(TAG, "Searching programs: '" + query + "'");
long time = SystemClock.elapsedRealtime();
- Assert.assertTrue(
- (columnForExactMatching != null && columnForExactMatching.length > 0) ||
- (columnForPartialMatching != null && columnForPartialMatching.length > 0));
-
String[] projection = {
Programs.COLUMN_CHANNEL_ID,
Programs.COLUMN_TITLE,