merge in nyc-release history after reset to nyc-dev
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index 4b83cac..d30018f 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -1229,8 +1229,13 @@
final String mediaUri = cursor.getString(2);
if (!TextUtils.isEmpty(mediaUri)) {
- getContext().getContentResolver().delete(Uri.parse(mediaUri), null,
- null);
+ final long token = Binder.clearCallingIdentity();
+ try {
+ getContext().getContentResolver().delete(Uri.parse(mediaUri), null,
+ null);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
}
}
}