summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-18 19:35:32 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-18 19:35:32 -0700
commit8dbbe3b52f815c49be986814743a521f802b4785 (patch)
tree78ed9bc346ec5f1edfe702dbb74ea16e7b6b99af /test-runner
parentf923ed6ff76a0fd022bcc83e748e82266ba4ed1b (diff)
parent63e7155c7d1d0c3f0027400aa09e9a45f648a80d (diff)
downloadframeworks_base-8dbbe3b52f815c49be986814743a521f802b4785.zip
frameworks_base-8dbbe3b52f815c49be986814743a521f802b4785.tar.gz
frameworks_base-8dbbe3b52f815c49be986814743a521f802b4785.tar.bz2
am 63e7155c: Merge change 4696 into donut
Merge commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d' * commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d': Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/android/test/mock/MockContext.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/test-runner/android/test/mock/MockContext.java b/test-runner/android/test/mock/MockContext.java
index 9e0cf2c..efc4880 100644
--- a/test-runner/android/test/mock/MockContext.java
+++ b/test-runner/android/test/mock/MockContext.java
@@ -24,6 +24,7 @@ import android.content.IntentFilter;
import android.content.BroadcastReceiver;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.res.AssetManager;
import android.content.res.Resources;
@@ -100,6 +101,11 @@ public class MockContext extends Context {
}
@Override
+ public ApplicationInfo getApplicationInfo() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public String getPackageResourcePath() {
throw new UnsupportedOperationException();
}