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

Catch and log exceptions from TvProvider.

Browse Source 
This keeps TvInputMannagerService from crashing when TvProvider fails.

[Test Report]
ST-APK-SoundTracks-001
ST-APK-SoundTracks-002
LiveTV OK

Bug: 160671268
Change-Id: Ie10e5eecea587bb00428c096832bd41920d4a6ac
This commit is contained in:
Baohe.Wang
2020-08-26 17:07:43 +08:00
committed by daren.liao
parent 09bbad130d
commit 409397f8eb
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;
}