commit a0567f4da20c626c3f3aab8ad126f1c3c997dc94
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 06 22:40:52 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 06 22:40:52 2018 +0000
tree 0a4bd328235b54198621767cbdbc6925953810a9
parent d8b851634584d2dd467066ada0703044b5659a3c
parent e3306241d825d988a5ed99f760321d52dcd13123

Merge "Prevent a broken widget from crashing the Launcher"

core/java/android/widget/RemoteViewsAdapter.java

diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java
index c5cd1a1..365638f 100644
--- a/core/java/android/widget/RemoteViewsAdapter.java
+++ b/core/java/android/widget/RemoteViewsAdapter.java
@@ -253,8 +253,12 @@
                     final IServiceConnection sd = mContext.getServiceDispatcher(this, this, flags);
                     Intent intent = (Intent) msg.obj;
                     int appWidgetId = msg.arg1;
-                    mBindRequested = AppWidgetManager.getInstance(mContext)
-                            .bindRemoteViewsService(mContext, appWidgetId, intent, sd, flags);
+                    try {
+                        mBindRequested = AppWidgetManager.getInstance(mContext)
+                                .bindRemoteViewsService(mContext, appWidgetId, intent, sd, flags);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Failed to bind remoteViewsService: " + e.getMessage());
+                    }
                     return;
                 }
                 case MSG_NOTIFY_DATA_SET_CHANGED: {