Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch and log exceptions from TvProvider." am: fb8aad8c9b am: 369696bf9f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540912

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c47e4819098c7cdcfdbcecbccee29b32818dc24
This commit is contained in:
Austin Shin
2021-03-15 09:18:37 +00:00
committed by Automerger Merge Worker
parent 2e196d3e6a 369696bf9f
commit 8400aa6caf
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

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