Merge changes from topic "presubmit-am-ffc9771d6fac4e3d913d1894862288e2" into tm-dev
* changes:
[automerge] Don't catch IllegalArgumentException from picker db query 2p: 56c82e18b8
Don't catch IllegalArgumentException from picker db query
diff --git a/src/com/android/providers/media/PickerUriResolver.java b/src/com/android/providers/media/PickerUriResolver.java
index 025745d..dde22ce 100644
--- a/src/com/android/providers/media/PickerUriResolver.java
+++ b/src/com/android/providers/media/PickerUriResolver.java
@@ -88,7 +88,7 @@
final ContentResolver resolver;
try {
resolver = getContentResolverForUserId(uri);
- } catch (IllegalArgumentException e) {
+ } catch (IllegalStateException e) {
// This is to be consistent with MediaProvider's response when a file is not found.
Log.e(TAG, "No item at " + uri, e);
throw new FileNotFoundException("No item at " + uri);
@@ -107,7 +107,7 @@
final ContentResolver resolver;
try {
resolver = getContentResolverForUserId(uri);
- } catch (IllegalArgumentException e) {
+ } catch (IllegalStateException e) {
// This is to be consistent with MediaProvider's response when a file is not found.
Log.e(TAG, "No item at " + uri, e);
throw new FileNotFoundException("No item at " + uri);
@@ -121,10 +121,9 @@
public Cursor query(Uri uri, String[] projection, int callingPid, int callingUid) {
checkUriPermission(uri, callingPid, callingUid);
-
try {
return queryInternal(uri, projection);
- } catch (IllegalArgumentException e) {
+ } catch (IllegalStateException e) {
// This is to be consistent with MediaProvider, it returns an empty cursor if the row
// does not exist.
Log.e(TAG, "File not found for uri: " + uri, e);
@@ -297,7 +296,7 @@
try {
return userId.getContentResolver(mContext);
} catch (NameNotFoundException e) {
- throw new IllegalArgumentException("Cannot find content resolver for uri: " + uri, e);
+ throw new IllegalStateException("Cannot find content resolver for uri: " + uri, e);
}
}
}
diff --git a/tests/src/com/android/providers/media/PickerUriResolverTest.java b/tests/src/com/android/providers/media/PickerUriResolverTest.java
index 672ad18..b691155 100644
--- a/tests/src/com/android/providers/media/PickerUriResolverTest.java
+++ b/tests/src/com/android/providers/media/PickerUriResolverTest.java
@@ -410,7 +410,7 @@
try {
sTestPickerUriResolver.getType(uri);
fail("Invalid user specified in the picker uri: " + uri);
- } catch (IllegalArgumentException expected) {
+ } catch (IllegalStateException expected) {
// expected
assertThat(expected.getMessage()).isEqualTo("Cannot find content resolver for uri: "
+ uri);