summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-09-08 13:14:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-08 13:14:56 -0700
commitd4ff4b649edbb235734866b232f300070d32e1b8 (patch)
treeac28a11a4fb85506b558a64826e10e0a1bb432b7 /tools
parentbb595190242a5405c0a6f0470532407543d6e00b (diff)
parente6a01f37934340c9fce9dcd8ee98b02d9d635af6 (diff)
downloadframeworks_base-d4ff4b649edbb235734866b232f300070d32e1b8.zip
frameworks_base-d4ff4b649edbb235734866b232f300070d32e1b8.tar.gz
frameworks_base-d4ff4b649edbb235734866b232f300070d32e1b8.tar.bz2
am e6a01f37: Merge "Fix build." into klp-dev
* commit 'e6a01f37934340c9fce9dcd8ee98b02d9d635af6': Fix build.
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java
index 688cc87..01740b1 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContentProvider.java
@@ -134,4 +134,14 @@ public final class BridgeContentProvider implements IContentProvider {
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public Uri canonicalize(String callingPkg, Uri uri) throws RemoteException {
+ return null;
+ }
+
+ @Override
+ public Uri uncanonicalize(String callingPkg, Uri uri) throws RemoteException {
+ return null;
+ }
}