commit e86b242b66997b2a6ee81de5d782ded916dda26a
author shubang <shubang@google.com> Fri Jul 20 15:59:18 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Jul 25 07:21:51 2018 -0700
tree e60dcae4693be826c83b45b2c6a1b1a827e07f57
parent 1bf1b4017f0a9aad803307ba0988c2925f11c8b0

Catch exceptions for METHOD_ADD_COLUMN

PiperOrigin-RevId: 205467779
Change-Id: Ie9b3896ba659ceebacd388e79e4f95a44a47c3dd

src/com/android/tv/util/TvProviderUtils.java

diff --git a/src/com/android/tv/util/TvProviderUtils.java b/src/com/android/tv/util/TvProviderUtils.java
index f4a3355..67290b3 100644
--- a/src/com/android/tv/util/TvProviderUtils.java
+++ b/src/com/android/tv/util/TvProviderUtils.java
@@ -140,13 +140,18 @@
         extra.putCharSequence(TvContract.EXTRA_COLUMN_NAME, EXTRA_PROGRAM_COLUMN);
         extra.putCharSequence(TvContract.EXTRA_DATA_TYPE, "TEXT");
         // If the add operation fails, the following just returns null without crashing.
-        Bundle allColumns =
-                context.getContentResolver()
-                        .call(
-                                contentUri,
-                                TvContract.METHOD_ADD_COLUMN,
-                                contentUri.toString(),
-                                extra);
+        Bundle allColumns = null;
+        try {
+            allColumns =
+                    context.getContentResolver()
+                            .call(
+                                    contentUri,
+                                    TvContract.METHOD_ADD_COLUMN,
+                                    contentUri.toString(),
+                                    extra);
+        } catch (Exception e) {
+            Log.e(TAG, "Error trying to add column.", e);
+        }
         if (allColumns == null) {
             Log.w(TAG, "Adding new column failed. Uri=" + contentUri);
         }