commit 28ec32e29e6e70321ef89cf672b43e7715d15710
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Jun 13 23:12:15 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Jun 13 23:12:15 2022 +0000
tree 0278293236be566d84e3b7c1c2a8be2452856f74
parent 6faeebac2a8f0d848b97a6dba18f4e1f6eb42791
parent 4a952601e601e7a83d4ae3755ea1fa5e8a0de664

Snap for 8717261 from 4a952601e601e7a83d4ae3755ea1fa5e8a0de664 to tm-d1-release

Change-Id: I2bab3926080159e1527eed0551ac2744ab778c37

shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java

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 8f730a9..b9691d1 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 @@
     }
 
     // @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()) {