commit df1e10ddacc5464da2910de073369210df01bec7
author Dongwon Kang <dwkang@google.com> Tue Feb 23 10:30:51 2016 -0800
committer Dongwon Kang <dwkang@google.com> Tue Feb 23 12:43:58 2016 -0800
tree 568dced52e136b6e2984b3af108ed11ae8449a5c
parent f8df4d0d430bef68254c695eb60e702638e8ff02

TIF: Add @NonNull for Programs.Genres.encode/decode

Bug: 27292029
Change-Id: Ib74f6383f3b0880179b51268e730ea8e88ab20c3

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 15a1838..5cf6811 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -16,6 +16,7 @@
 
 package android.media.tv;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.content.ComponentName;
@@ -1332,7 +1333,7 @@
              * @return an encoded genre string that can be inserted into the
              *         {@link #COLUMN_BROADCAST_GENRE} or {@link #COLUMN_CANONICAL_GENRE} column.
              */
-            public static String encode(String... genres) {
+            public static String encode(@NonNull String... genres) {
                 StringBuilder sb = new StringBuilder();
                 String separator = "";
                 for (String genre : genres) {
@@ -1367,7 +1368,7 @@
              *            {@link #COLUMN_BROADCAST_GENRE} or {@link #COLUMN_CANONICAL_GENRE} column.
              * @return genre strings.
              */
-            public static String[] decode(String genres) {
+            public static String[] decode(@NonNull String genres) {
                 if (genres.isEmpty()) {
                     return EMPTY_STRING_ARRAY;
                 }