summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorMitsuru Oshima <>2009-04-28 18:13:25 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-28 18:13:25 -0700
commit13735a255dedd2c2e3b0cff66f0be2e17671f553 (patch)
tree9b55fcc3089076210763f62acf89563ed71a720b /test-runner
parentd30605200b8b0f10e4740a9d7266d240023e69cd (diff)
parent8169daed2f7a8731d478b884b1f455c747b88478 (diff)
downloadframeworks_base-13735a255dedd2c2e3b0cff66f0be2e17671f553.zip
frameworks_base-13735a255dedd2c2e3b0cff66f0be2e17671f553.tar.gz
frameworks_base-13735a255dedd2c2e3b0cff66f0be2e17671f553.tar.bz2
Merge branch 'readonly-p4-donut' into donut
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/android/test/mock/MockContext.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/test-runner/android/test/mock/MockContext.java b/test-runner/android/test/mock/MockContext.java
index e733dd1..bd39a14 100644
--- a/test-runner/android/test/mock/MockContext.java
+++ b/test-runner/android/test/mock/MockContext.java
@@ -386,4 +386,12 @@ public class MockContext extends Context {
throws PackageManager.NameNotFoundException {
throw new UnsupportedOperationException();
}
+
+ /**
+ * @hide
+ */
+ @Override
+ public float getApplicationScale() {
+ throw new UnsupportedOperationException();
+ }
}