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

Commit 369696bf authored by Austin Shin's avatar Austin Shin Committed by Automerger Merge Worker
Browse files

Merge "Catch and log exceptions from TvProvider." am: fb8aad8c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf8885fb7f8c03a6cb7150ffd28d6cb001dc368d
parents ee705dfe fb8aad8c

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;

                }