diff options
| author | Andrii Kulian <akulian@google.com> | 2020-01-31 01:16:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-31 01:16:34 +0000 |
| commit | e11e951f6660d600187addf0d732b42dc0896aeb (patch) | |
| tree | 3d76b4ad3abee5bf7129a3c8983d6c5efffe1a07 /test-mock | |
| parent | f40232a40fd023b03c75644776216a0ffe408eec (diff) | |
| parent | e57f2dc246532d54229046d319d7b907b23288b3 (diff) | |
Merge changes from topic "add_bundle_to_window_context"
* changes:
Exempt-From-Owner-Approval: Fix usages of WindowManager.getDefaultDisplay() in f/b
Add bundle options to Context#createWindowContext API
Diffstat (limited to 'test-mock')
| -rw-r--r-- | test-mock/src/android/test/mock/MockContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java index 36074edd187e..359c44849634 100644 --- a/test-mock/src/android/test/mock/MockContext.java +++ b/test-mock/src/android/test/mock/MockContext.java @@ -812,7 +812,7 @@ public class MockContext extends Context { } @Override - public @NonNull Context createWindowContext(int type) { + public @NonNull Context createWindowContext(int type, Bundle options) { throw new UnsupportedOperationException(); } |