summaryrefslogtreecommitdiff
path: root/test-mock
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-10-16 00:20:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-10-16 00:20:52 +0000
commit02f2a315d7f7748a080c8e2c79e96a3afde3dae1 (patch)
treecb6f53352c002828cc221b77c2a84b4caa89aa41 /test-mock
parent6e7ece7e4daa59dad2009e4a2318de6826edfe9e (diff)
parent5281b6b4c06f3b6b3d63ed9877101229645df9a9 (diff)
Merge "Add Context.getDisplayId() to avoid possible IPC"
Diffstat (limited to 'test-mock')
-rw-r--r--test-mock/src/android/test/mock/MockContext.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java
index 9d260ebf7231..fa5b896ea126 100644
--- a/test-mock/src/android/test/mock/MockContext.java
+++ b/test-mock/src/android/test/mock/MockContext.java
@@ -774,6 +774,12 @@ public class MockContext extends Context {
/** @hide */
@Override
+ public int getDisplayId() {
+ throw new UnsupportedOperationException();
+ }
+
+ /** @hide */
+ @Override
public void updateDisplay(int displayId) {
throw new UnsupportedOperationException();
}