diff options
| -rw-r--r-- | core/java/android/hardware/display/DisplayManagerGlobal.java | 6 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java index c4af87116eed..bebca57125b6 100644 --- a/core/java/android/hardware/display/DisplayManagerGlobal.java +++ b/core/java/android/hardware/display/DisplayManagerGlobal.java @@ -1499,7 +1499,7 @@ public final class DisplayManagerGlobal { } @VisibleForTesting - static final class DisplayListenerDelegate { + public static final class DisplayListenerDelegate { public final DisplayListener mListener; public volatile long mInternalEventFlagsMask; @@ -1536,7 +1536,7 @@ public final class DisplayManagerGlobal { } @VisibleForTesting - boolean isEventFilterExplicit() { + public boolean isEventFilterExplicit() { return mIsEventFilterExplicit; } @@ -1892,7 +1892,7 @@ public final class DisplayManagerGlobal { } @VisibleForTesting - CopyOnWriteArrayList<DisplayListenerDelegate> getDisplayListeners() { + public CopyOnWriteArrayList<DisplayListenerDelegate> getDisplayListeners() { return mDisplayListeners; } } diff --git a/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java b/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java index 8ef105f79988..de5f0ffbe23f 100644 --- a/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java +++ b/core/tests/coretests/src/android/hardware/display/DisplayManagerGlobalTest.java @@ -177,8 +177,10 @@ public class DisplayManagerGlobalTest { @RequiresFlagsEnabled(Flags.FLAG_DELAY_IMPLICIT_RR_REGISTRATION_UNTIL_RR_ACCESSED) public void test_refreshRateRegistration_implicitRRCallbacksEnabled() throws RemoteException { + DisplayManager.DisplayListener displayListener1 = + Mockito.mock(DisplayManager.DisplayListener.class); // Subscription without supplied events doesn't subscribe to RR events - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + mDisplayManagerGlobal.registerDisplayListener(displayListener1, mHandler, ALL_DISPLAY_EVENTS, /* packageName= */ null, /* isEventFilterExplicit */ false); Mockito.verify(mDisplayManager) @@ -187,7 +189,9 @@ public class DisplayManagerGlobalTest { // After registering to refresh rate changes, subscription without supplied events subscribe // to RR events mDisplayManagerGlobal.registerForRefreshRateChanges(); - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + DisplayManager.DisplayListener displayListener2 = + Mockito.mock(DisplayManager.DisplayListener.class); + mDisplayManagerGlobal.registerDisplayListener(displayListener2, mHandler, ALL_DISPLAY_EVENTS, /* packageName= */ null, /* isEventFilterExplicit */ false); Mockito.verify(mDisplayManager) @@ -203,7 +207,9 @@ public class DisplayManagerGlobalTest { } // Subscription to RR when events are supplied doesn't happen - mDisplayManagerGlobal.registerDisplayListener(mDisplayListener, mHandler, + DisplayManager.DisplayListener displayListener3 = + Mockito.mock(DisplayManager.DisplayListener.class); + mDisplayManagerGlobal.registerDisplayListener(displayListener3, mHandler, ALL_DISPLAY_EVENTS, /* packageName= */ null, /* isEventFilterExplicit */ true); Mockito.verify(mDisplayManager) @@ -214,7 +220,6 @@ public class DisplayManagerGlobalTest { int subscribedListenersCount = 0; int nonSubscribedListenersCount = 0; for (DisplayManagerGlobal.DisplayListenerDelegate delegate: delegates) { - if (delegate.isEventFilterExplicit()) { assertEquals(ALL_DISPLAY_EVENTS, delegate.mInternalEventFlagsMask); nonSubscribedListenersCount++; |