summaryrefslogtreecommitdiff
path: root/test-runner/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-22 22:28:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-22 22:28:10 +0000
commitabc6fd57de4450a9a3769e064ca69e05aeb2d5de (patch)
treeb3a6b7729cc679b51341161da6b909de978a05db /test-runner/src
parent6de0d0983078ab933fcea43e750d6d22f05bf426 (diff)
parent6d6cd68660635d670b0cb17f348b7c1da13704b3 (diff)
Merge "Stop loading other package's font by default."
Diffstat (limited to 'test-runner/src')
-rw-r--r--test-runner/src/android/test/mock/MockContext.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index ebad81cdda34..5e5ba462cfca 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -816,6 +816,12 @@ public class MockContext extends Context {
/** {@hide} */
@Override
+ public boolean canLoadUnsafeResources() {
+ throw new UnsupportedOperationException();
+ }
+
+ /** {@hide} */
+ @Override
public IBinder getActivityToken() {
throw new UnsupportedOperationException();
}