summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-12 08:26:05 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-12 08:26:05 -0700
commitbf85d63cb8858432ff845250fdaffdb556d2ef1b (patch)
treebccd2a36cb6534bbb9fc75cdf3ff550fce35e8e7 /tools
parent32c79898c0020637b2f8e536c8208519801eb9cb (diff)
parent78f0f8cb2efe9410127c39201e240f6d438eb53c (diff)
downloadframeworks_base-bf85d63cb8858432ff845250fdaffdb556d2ef1b.zip
frameworks_base-bf85d63cb8858432ff845250fdaffdb556d2ef1b.tar.gz
frameworks_base-bf85d63cb8858432ff845250fdaffdb556d2ef1b.tar.bz2
am 78f0f8cb: Merge changes 3953,3954 into donut
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c' * commit '78f0f8cb2efe9410127c39201e240f6d438eb53c': Make the file backup helper not crash if a file you requested Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
index baa3d53..d0896b5 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java
@@ -966,6 +966,12 @@ public final class BridgeContext extends Context {
}
@Override
+ public File getSharedPrefsFile(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
public SharedPreferences getSharedPreferences(String arg0, int arg1) {
// TODO Auto-generated method stub
return null;