Merge "Catch exception during query" into main (959dc5d6) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/BluetoothMethodProxy.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -100,7 +100,13 @@ public class BluetoothMethodProxy {
		final String selection,
		final String[] selectionArgs,
		final String sortOrder) {
		return contentResolver.query(contentUri, projection, selection, selectionArgs, sortOrder);
		try {
		return contentResolver.query(
		contentUri, projection, selection, selectionArgs, sortOrder);
		} catch (Exception e) {
		Log.e(TAG, "Exception happened" + e + "\n" + Log.getStackTraceString(new Throwable()));
		return null;
		}
		}

		/** Proxies {@link ContentResolver#query(Uri, String[], Bundle, CancellationSignal)}. */
		@@ -110,7 +116,12 @@ public class BluetoothMethodProxy {
		final String[] projection,
		final Bundle queryArgs,
		final CancellationSignal cancellationSignal) {
		try {
		return contentResolver.query(contentUri, projection, queryArgs, cancellationSignal);
		} catch (Exception e) {
		Log.e(TAG, "Exception happened " + e + "\n" + Log.getStackTraceString(new Throwable()));
		return null;
		}
		}

		/** Proxies {@link ContentResolver#insert(Uri, ContentValues)}. */