summaryrefslogtreecommitdiffstats
path: root/test-runner/android
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-09-26 17:06:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-09-26 17:06:41 -0700
commitbc21ba2410233b40b21a190b26285a791ac5cc58 (patch)
tree6d4977afd686b413e784571495da1bb2da5da773 /test-runner/android
parentc321ab992d526cde098986d512ce4a051c486607 (diff)
parent093f581090d8cf98f5877746d924107f7695dd8b (diff)
downloadframeworks_base-bc21ba2410233b40b21a190b26285a791ac5cc58.zip
frameworks_base-bc21ba2410233b40b21a190b26285a791ac5cc58.tar.gz
frameworks_base-bc21ba2410233b40b21a190b26285a791ac5cc58.tar.bz2
am 093f5810: Merge change 27238 into eclair
Merge commit '093f581090d8cf98f5877746d924107f7695dd8b' into eclair-plus-aosp * commit '093f581090d8cf98f5877746d924107f7695dd8b': The touch screen is probably a feature.
Diffstat (limited to 'test-runner/android')
-rw-r--r--test-runner/android/test/mock/MockPackageManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/test-runner/android/test/mock/MockPackageManager.java b/test-runner/android/test/mock/MockPackageManager.java
index beb9044..2f313af 100644
--- a/test-runner/android/test/mock/MockPackageManager.java
+++ b/test-runner/android/test/mock/MockPackageManager.java
@@ -430,6 +430,11 @@ public class MockPackageManager extends PackageManager {
}
@Override
+ public boolean hasSystemFeature(String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public boolean isSafeMode() {
throw new UnsupportedOperationException();
}