commit 079cf523365e4018d1a439e1a32bb30d79c069c3
author Jiabin Huang <jiabin@google.com> Sat Feb 20 07:01:28 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 20 07:01:29 2016 +0000
tree e3938bf3655c7470e465850e8c3d8863fa285cb8
parent 116229b79711e45f8da97ecd7b3437431d3d8327
parent 0388f0e503c2b38834aefdb2189f558e1060252b

Merge "TIF: optimize android.media.tv.Tvcontract.Programs.Genres#decode" into nyc-dev

media/java/android/media/tv/TvContract.java

diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index 7b8e4b2..1c11842 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -1314,6 +1314,8 @@
             private static final char COMMA = ',';
             private static final String DELIMITER = ",";
 
+            private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
             private Genres() {}
 
             /**
@@ -1359,6 +1361,12 @@
              * @return genre strings.
              */
             public static String[] decode(String genres) {
+                if (genres.isEmpty()) {
+                    return EMPTY_STRING_ARRAY;
+                }
+                if (genres.indexOf(COMMA) == -1 && genres.indexOf(DOUBLE_QUOTE) == -1) {
+                    return new String[] {genres.trim()};
+                }
                 StringBuilder sb = new StringBuilder();
                 List<String> results = new ArrayList<>();
                 int length = genres.length();