Merge pull request #2339 from mcginty/content-security-exception

catch content security exception
pull/1/head
Moxie Marlinspike 10 years ago
commit 18961e6369

@ -39,11 +39,15 @@ public class PartAuthority {
PartDatabase partDatabase = DatabaseFactory.getPartDatabase(context);
int match = uriMatcher.match(uri);
try {
switch (match) {
case PART_ROW: return partDatabase.getPartStream(masterSecret, ContentUris.parseId(uri));
case THUMB_ROW: return partDatabase.getThumbnailStream(masterSecret, ContentUris.parseId(uri));
default: return context.getContentResolver().openInputStream(uri);
}
} catch (SecurityException se) {
throw new IOException(se);
}
}
public static Uri getPublicPartUri(Uri uri) {

Loading…
Cancel
Save