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

Merge "TIF: Add null-checking in Programs.Genres.encode/decode" into nyc-dev

Browse Source 
am: 523250b6b8

* commit '523250b6b886b524e13a990be832019559883af6':
  TIF: Add null-checking in Programs.Genres.encode/decode
This commit is contained in:
Dongwon Kang
2016-02-24 22:01:02 +00:00
committed by android-build-merger
parent 9eb693b70b 523250b6b8
commit ba91d19dac
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.IBinder;
import android.provider.BaseColumns;
import android.text.TextUtils;
import android.util.ArraySet;
import java.util.ArrayList;
@@ -1376,6 +1377,10 @@ public final class TvContract {
* {@link #COLUMN_BROADCAST_GENRE} or {@link #COLUMN_CANONICAL_GENRE} column.
*/
public static String encode(@NonNull String... genres) {
if (genres == null) {
// MNC and before will throw a NPE.
return null;
}
StringBuilder sb = new StringBuilder();
String separator = "";
for (String genre : genres) {
@@ -1411,7 +1416,8 @@ public final class TvContract {
* @return genre strings.
*/
public static String[] decode(@NonNull String genres) {
if (genres.isEmpty()) {
if (TextUtils.isEmpty(genres)) {
// MNC and before will throw a NPE for {@code null} genres.
return EMPTY_STRING_ARRAY;
}
if (genres.indexOf(COMMA) == -1 && genres.indexOf(DOUBLE_QUOTE) == -1) {