Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 409397f8 authored by Baohe.Wang's avatar Baohe.Wang Committed by daren.liao
Browse files

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
parent 09bbad13

services/core/java/com/android/server/tv/TvInputManagerService.java

+10 −2
Original line number Diff line number Diff line
@@ -2934,7 +2934,11 @@ public final class TvInputManagerService extends SystemService { 
                    values.put(TvContract.WatchedPrograms.COLUMN_INTERNAL_SESSION_TOKEN,

                            sessionToken.toString());



                    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());



                    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;

                }