commit 8f5ec7a82d02b0a5d3bd6eff7d3f8c53489ec6ae
author Conrad Chen <conradchen@google.com> Wed Apr 26 20:41:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 26 20:41:16 2017 +0000
tree 72d7b473ffe888ef72945a66c1144f828c9934a4
parent 90dfc95509a8d1ae2d62178be1c06e0b0c7a06bf
parent 6b33ebe4bdd90b7887772ca3148b8f91854afba0

Merge "Fix preview channels insertion with null input ID" into oc-dev
am: 6b33ebe4bd

Change-Id: Id27550ae7a2b19e1f399539a35cf97e7c1983352

src/com/android/providers/tv/TvProvider.java

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 @@
             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);
                 }