Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: Add @NonNull for Programs.Genres.encode/decode" into nyc-dev

Browse Source 
am: 62b6a00b64

* commit '62b6a00b64ad8676d5a93a3d6f7baa379a14c724':
  TIF: Add @NonNull for Programs.Genres.encode/decode
This commit is contained in:
Dongwon Kang
2016-02-23 21:08:42 +00:00
committed by android-build-merger
parent c5cb5e1b61 62b6a00b64
commit 9933ef271b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/tv/TvContract.java
View File

@@ -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 @@ public final class TvContract {
* @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 @@ public final class TvContract {
* {@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;
}