Merge "Wrap service connection in try-catch block" into main (84f11774) · Commits · e / os / android_frameworks_base

core/java/android/appwidget/AppWidgetManager.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -1684,10 +1684,14 @@ public class AppWidgetManager {
		private IBinder mIBinder;

		ConnectionTask(@NonNull FilterComparison filter) {
		try {
		mContext.bindService(filter.getIntent(),
		Context.BindServiceFlags.of(Context.BIND_AUTO_CREATE),
		mHandler::post,
		this);
		} catch (Exception e) {
		Log.e(TAG, "Error connecting to service in connection cache", e);
		}
		}

		@Override
		@@ -1737,7 +1741,11 @@ public class AppWidgetManager {
		handleNext();
		return;
		}
		try {
		mContext.unbindService(this);
		} catch (Exception e) {
		Log.e(TAG, "Error unbinding the cached connection", e);
		}
		mActiveConnections.values().remove(this);
		}
		}