summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-29 15:53:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-29 15:53:38 -0700
commitf3b4c93e0da9af2db9e16864faa734cf70fecfe3 (patch)
tree7e9700c7556be59ccc6919bcb4cd0a3cdb50b7f6 /tools/layoutlib
parent09dfd60bc37585e2670e4ca997940256e5b21ac8 (diff)
parentae5811c71405878b09eace395ec2b28e54eeb427 (diff)
downloadframeworks_base-f3b4c93e0da9af2db9e16864faa734cf70fecfe3.zip
frameworks_base-f3b4c93e0da9af2db9e16864faa734cf70fecfe3.tar.gz
frameworks_base-f3b4c93e0da9af2db9e16864faa734cf70fecfe3.tar.bz2
am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev
* commit 'ae5811c71405878b09eace395ec2b28e54eeb427': Fix (mostly) issue #5109947: Race condition between retrieving a...
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentResolver.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentResolver.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentResolver.java
index fec2c3f..8d259d7 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentResolver.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentResolver.java
@@ -72,6 +72,11 @@ public class BridgeContentResolver extends ContentResolver {
return releaseProvider(icp);
}
+ /** @hide */
+ @Override
+ public void unstableProviderDied(IContentProvider icp) {
+ }
+
/**
* Stub for the layoutlib bridge content resolver.
*/