Merge "Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode""

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

             * @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*");

            }

            /**