From 409397f8ebab640f84db3c09b4be12e5e996b7ce Mon Sep 17 00:00:00 2001 From: "Baohe.Wang" Date: Wed, 26 Aug 2020 17:07:43 +0800 Subject: [PATCH] Catch and log exceptions from TvProvider. 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 --- .../com/android/server/tv/TvInputManagerService.java | 12 ++++++++++-- 1 file 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 d858ae41cee89..61bd5dfd3878e 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; }