summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-09-08 20:08:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-08 20:13:13 +0000
commite6a01f37934340c9fce9dcd8ee98b02d9d635af6 (patch)
treeef770da40c6f0882b5e4af1a5226b8ce43b59dd6
parent89c5a1180830934db485ff9c189143deab653310 (diff)
parent01f8c0e27756599b2395514e27bd3b238326f220 (diff)
downloadframeworks_base-e6a01f37934340c9fce9dcd8ee98b02d9d635af6.zip
frameworks_base-e6a01f37934340c9fce9dcd8ee98b02d9d635af6.tar.gz
frameworks_base-e6a01f37934340c9fce9dcd8ee98b02d9d635af6.tar.bz2
Merge "Fix build." into klp-dev
-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;
+ }
}