summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-09-09 17:15:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-09 17:15:23 -0700
commit0b4c23efd9775bb43af60a545b4f9596715bcaac (patch)
tree38e0ed0e045804769d55fabaf6b3b99eb106eb0b /core/java
parent86ebf2876dce04c845ae61846f3aa966d13eab8c (diff)
parent6874b17d7937a4616a119aea58c8a9c8acef4e7f (diff)
downloadframeworks_base-0b4c23efd9775bb43af60a545b4f9596715bcaac.zip
frameworks_base-0b4c23efd9775bb43af60a545b4f9596715bcaac.tar.gz
frameworks_base-0b4c23efd9775bb43af60a545b4f9596715bcaac.tar.bz2
am 6874b17d: am ff44ed58: Merge "Disabled states, more UX work, bug fixes." into klp-dev
* commit '6874b17d7937a4616a119aea58c8a9c8acef4e7f': Disabled states, more UX work, bug fixes.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/ContentProviderClient.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index e6d9b24..e83c727 100644
--- a/core/java/android/content/ContentProviderClient.java
+++ b/core/java/android/content/ContentProviderClient.java
@@ -344,7 +344,10 @@ public class ContentProviderClient {
/** {@hide} */
public static void closeQuietly(ContentProviderClient client) {
if (client != null) {
- client.release();
+ try {
+ client.release();
+ } catch (Exception ignored) {
+ }
}
}
}