From 072300558ed635a537e56b9f436e8998720cb9ab Mon Sep 17 00:00:00 2001
From: Chulwoo Lee <chulwoo@google.com>
Date: Tue, 2 Feb 2016 18:34:58 +0000
Subject: [PATCH] Revert "TIF: Improve
 android.media.tv.TvContract.Programs.Genres#decode"

This reverts commit a6130cee3ac9ed8648be005adcf217cf4426defc.

Change-Id: Id3d5ec0ca35bbd8e0b28b2b0dd936078b5da93d6
---
 media/java/android/media/tv/TvContract.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index e97df7870780d..7cd086ecf14de 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
@@ -1319,13 +1318,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*");
             }
 
             /**