diff options
| author | nchalko <nchalko@google.com> | 2018-09-26 10:21:56 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-09-26 10:22:28 -0700 |
| commit | 193b7e219fa6d800c7ecdcf9281eaeeba655c980 (patch) | |
| tree | b40264b6bdfedcb513e9db7a1ff5320f3a792121 /src/com/android/tv/guide | |
| parent | 1cd60ade3cc7e23c31df7e7737e716f73e337eee (diff) | |
| download | TV-193b7e219fa6d800c7ecdcf9281eaeeba655c980.tar.gz | |
Check for empty Channel Entry Map
Check if map is empty before accessing its elements.
Imported from http://pa/1146990
Change-Id: I24cc70d66e2e8f711492ada73ab7e3a091a89004
PiperOrigin-RevId: 214625185
Diffstat (limited to 'src/com/android/tv/guide')
| -rw-r--r-- | src/com/android/tv/guide/ProgramManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/tv/guide/ProgramManager.java b/src/com/android/tv/guide/ProgramManager.java index 417d61af..6b5a629d 100644 --- a/src/com/android/tv/guide/ProgramManager.java +++ b/src/com/android/tv/guide/ProgramManager.java @@ -402,7 +402,7 @@ public class ProgramManager { * given {@code channelId}. */ int getTableEntryCount(long channelId) { - return mChannelIdEntriesMap.get(channelId).size(); + return mChannelIdEntriesMap.isEmpty() ? 0 : mChannelIdEntriesMap.get(channelId).size(); } /** @@ -553,6 +553,9 @@ public class ProgramManager { @Nullable private TableEntry getTableEntry(long channelId, long entryId) { + if (mChannelIdEntriesMap.isEmpty()) { + return null; + } List<TableEntry> entries = mChannelIdEntriesMap.get(channelId); if (entries != null) { for (TableEntry entry : entries) { |