aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-14 00:38:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-14 00:38:09 +0000
commitd40b3471896f744d85e3c78bff42b7ca66e8c84e (patch)
tree0278293236be566d84e3b7c1c2a8be2452856f74
parent1ba081b6bfa27736e96993669438f58a5ddac6c6 (diff)
parentd1569670223eba0a392668bd7eab986795328cbe (diff)
downloadrobolectric-shadows-android13-gsi.tar.gz
Snap for 8717000 from 90bc03413959ad387d2a6ec37116b62de6f4b84e to tm-release am: d156967022android13-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric-shadows/+/18876986 Change-Id: I45438e068486dedff45274fb9c9717a3fd3c843d 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()) {