diff options
| author | Conrad Chen <conradchen@google.com> | 2017-04-26 20:35:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-26 20:35:27 +0000 |
| commit | 6b33ebe4bdd90b7887772ca3148b8f91854afba0 (patch) | |
| tree | 72d7b473ffe888ef72945a66c1144f828c9934a4 | |
| parent | 120775933cb208e9f088d367b852a4747de67688 (diff) | |
| parent | 3b80faf3f29f523bd1032636bdbdc8efaf8927c5 (diff) | |
| download | TvProvider-6b33ebe4bdd90b7887772ca3148b8f91854afba0.tar.gz | |
Merge "Fix preview channels insertion with null input ID" into oc-dev
| -rw-r--r-- | src/com/android/providers/tv/TvProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java index 855e184..725641a 100644 --- a/src/com/android/providers/tv/TvProvider.java +++ b/src/com/android/providers/tv/TvProvider.java @@ -1331,7 +1331,7 @@ public class TvProvider extends ContentProvider { case MATCH_CHANNEL: // Preview channels are not necessarily associated with TV input service. // Therefore, we fill a fake ID to meet not null restriction for preview channels. - if (!values.containsKey(Channels.COLUMN_INPUT_ID) + if (values.get(Channels.COLUMN_INPUT_ID) == null && Channels.TYPE_PREVIEW.equals(values.get(Channels.COLUMN_TYPE))) { values.put(Channels.COLUMN_INPUT_ID, EMPTY_STRING); } |