summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Austin Shin <austinshin@google.com> 2021-03-15 08:17:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-03-15 08:17:59 +0000
commitfb8aad8c9b5a91e29014ae7830bd2c68f4336a9f (patch)
tree28cdbee951180d3c2efd48a881464a5d829a9571
parented60cc949b26acd0a01aa22bd6feb60daeb82c5f (diff)
parent409397f8ebab640f84db3c09b4be12e5e996b7ce (diff)
Merge "Catch and log exceptions from TvProvider."
-rwxr-xr-xservices/core/java/com/android/server/tv/TvInputManagerService.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/tv/TvInputManagerService.java b/services/core/java/com/android/server/tv/TvInputManagerService.java
index d858ae41cee8..61bd5dfd3878 100755
--- a/services/core/java/com/android/server/tv/TvInputManagerService.java
+++ b/services/core/java/com/android/server/tv/TvInputManagerService.java
@@ -2934,7 +2934,11 @@ public final class TvInputManagerService extends SystemService {
values.put(TvContract.WatchedPrograms.COLUMN_INTERNAL_SESSION_TOKEN,
sessionToken.toString());
- mContentResolver.insert(TvContract.WatchedPrograms.CONTENT_URI, values);
+ try{
+ mContentResolver.insert(TvContract.WatchedPrograms.CONTENT_URI, values);
+ }catch(IllegalArgumentException ex){
+ Slog.w(TAG, "error in insert db for MSG_LOG_WATCH_START", ex);
+ }
args.recycle();
break;
}
@@ -2949,7 +2953,11 @@ public final class TvInputManagerService extends SystemService {
values.put(TvContract.WatchedPrograms.COLUMN_INTERNAL_SESSION_TOKEN,
sessionToken.toString());
- mContentResolver.insert(TvContract.WatchedPrograms.CONTENT_URI, values);
+ try{
+ mContentResolver.insert(TvContract.WatchedPrograms.CONTENT_URI, values);
+ }catch(IllegalArgumentException ex){
+ Slog.w(TAG, "error in insert db for MSG_LOG_WATCH_END", ex);
+ }
args.recycle();
break;
}