diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index c219418019932..62a01dcf88082 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -30,7 +30,6 @@ import android.util.ArraySet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 /**
  * The contract between the TV provider and applications. Contains definitions for the supported
@@ -1331,13 +1330,7 @@ public final class TvContract {
              * @return canonical genre strings.
              */
             public static String[] decode(String genres) {
-                StringTokenizer st = new StringTokenizer(genres, "\\s*,\\s*");
-                String[] result = new String[st.countTokens()];
-                int i = 0;
-                while (st.hasMoreTokens()){
-                    result[i++] = st.nextToken();
-                }
-                return result;
+                return genres.split("\\s*,\\s*");
             }
 
             /**