summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-02-23 09:21:12 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-02-23 09:21:12 (GMT)
commit16b9c77617237cf31075f3abea7c0ddf6b18926e (patch)
treec3dc49467016953ab39534e8c35fcda9996d9acd
parent7e74ec12896a3c61ba2be0e9bfbcff6c99aaa66b (diff)
downloadampere-16b9c77617237cf31075f3abea7c0ddf6b18926e.zip
ampere-16b9c77617237cf31075f3abea7c0ddf6b18926e.tar.gz
ampere-16b9c77617237cf31075f3abea7c0ddf6b18926e.tar.bz2
ChannelInfo: fix null point error [1/1]
PD# NONE google channel's display number sometimes is null Change-Id: I6030ce02fd48a6b9cb5628151cc0525ea4627fee
Diffstat
-rw-r--r--tv/frameworks/core/java/com/droidlogic/app/tv/ChannelInfo.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/tv/frameworks/core/java/com/droidlogic/app/tv/ChannelInfo.java b/tv/frameworks/core/java/com/droidlogic/app/tv/ChannelInfo.java
index 01de410..d470ed6 100644
--- a/tv/frameworks/core/java/com/droidlogic/app/tv/ChannelInfo.java
+++ b/tv/frameworks/core/java/com/droidlogic/app/tv/ChannelInfo.java
@@ -1234,6 +1234,10 @@ public class ChannelInfo {
}
private static int stringToInteger(String string) {
+ if (TextUtils.isEmpty(string)) {
+ return -1;
+ }
+
String s = string.replaceAll("\\D", "");
if (!TextUtils.isEmpty(s))
return Integer.valueOf(s);