commit 51dea8653537b520118a78f67763cfc8374584da
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 07 01:29:16 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 07 01:29:16 2022 +0000
tree 0278293236be566d84e3b7c1c2a8be2452856f74
parent eb9599ff559f2b808ea1a2e5d6f0a4ab417d3f76
parent 547cd503d4cbd2e05bb9acc1d6f57d681c67908f

Snap for 8803894 from 547cd503d4cbd2e05bb9acc1d6f57d681c67908f to mainline-permission-release

Change-Id: I6c0825e6876c59ba2ab322ac52be03fa0ac4bd64

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()) {