summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-10 11:38:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-10 11:38:52 -0700
commit58d4f2e36f4091272c40d59fb3b7b80ee792ba57 (patch)
tree41e60ca2e85a20b3c9c38ba8080b73eb19b11b62 /tools/layoutlib
parent9979ee45852a304fbf41d818092e509224152cde (diff)
parente2e0391389fce1a9fd9d5c5442ba1901b6d96211 (diff)
downloadframeworks_base-58d4f2e36f4091272c40d59fb3b7b80ee792ba57.zip
frameworks_base-58d4f2e36f4091272c40d59fb3b7b80ee792ba57.tar.gz
frameworks_base-58d4f2e36f4091272c40d59fb3b7b80ee792ba57.tar.bz2
am e2e03913: am dd79ae6b: Merge "Add infrastructure for accessing "unstable" content providers." into jb-dev
* commit 'e2e0391389fce1a9fd9d5c5442ba1901b6d96211': Add infrastructure for accessing "unstable" content providers.
Diffstat (limited to 'tools/layoutlib')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentResolver.java10
1 files changed, 10 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 0257686..fec2c3f 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
@@ -62,6 +62,16 @@ public class BridgeContentResolver extends ContentResolver {
return false;
}
+ @Override
+ protected IContentProvider acquireUnstableProvider(Context c, String name) {
+ return acquireProvider(c, name);
+ }
+
+ @Override
+ public boolean releaseUnstableProvider(IContentProvider icp) {
+ return releaseProvider(icp);
+ }
+
/**
* Stub for the layoutlib bridge content resolver.
*/