aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2022-06-13 19:48:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-13 19:48:22 +0000
commit4a952601e601e7a83d4ae3755ea1fa5e8a0de664 (patch)
tree0278293236be566d84e3b7c1c2a8be2452856f74
parent5056fea60efb3f385b8502a650d96a7bff7db3a6 (diff)
parent90bc03413959ad387d2a6ec37116b62de6f4b84e (diff)
downloadrobolectric-shadows-4a952601e601e7a83d4ae3755ea1fa5e8a0de664.tar.gz
Update IDisplayManager proxy. am: 90bc034139
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric-shadows/+/18831737 Change-Id: I2d5eda65994b836527b403a0c6cc7820b5c831f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java
index 8f730a9cb..b9691d104 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java
@@ -81,7 +81,7 @@ public class ShadowDisplayManagerGlobal {
}
// @Override // todo: use @Implements/@Implementation for signature checking
- public int[] getDisplayIds() throws RemoteException {
+ public int[] getDisplayIds(boolean includeDisabledDisplays) throws RemoteException {
int[] ids = new int[displayInfos.size()];
int i = 0;
for (Integer displayId : displayInfos.keySet()) {