commit 826a9248e39a65d05dc247982352fdc68cca6266
author Manasi Navare <navaremanasi@google.com> Mon Feb 03 23:27:34 2025 +0000
committer Manasi Navare <navaremanasi@google.com> Tue Feb 04 22:28:28 2025 +0000
tree b7b025d0e7e8072a0d5ce89236f167748d6d540e
parent 54e7140b58613ed5036f210e96eb57f20c116fe1

Add dispatchModeRejected exception in NativeDisplayReceiver

Once the NativeDisplayReceiver receives the dispatchModeRejected
call from SF, this exception needs to be cleared and raised.
This was missing in earlier enabling so add this.

Bug: 394159297
Test: Manual
Flag: com.android.graphics.surfaceflinger.flags.display_config_error_hal

Change-Id: Ie1f53f3666bb04bc7f2df8ee98e0d535037b4b98
Signed-off-by: Manasi Navare <navaremanasi@google.com>

core/jni/android_view_DisplayEventReceiver.cpp

diff --git a/core/jni/android_view_DisplayEventReceiver.cpp b/core/jni/android_view_DisplayEventReceiver.cpp
index 7ff1f8c..142a4d0 100644
--- a/core/jni/android_view_DisplayEventReceiver.cpp
+++ b/core/jni/android_view_DisplayEventReceiver.cpp
@@ -283,6 +283,8 @@
                             displayId.value, modeId);
         ALOGV("receiver %p ~ Returned from Mode Rejected handler.", this);
     }
+
+    mMessageQueue->raiseAndClearException(env, "dispatchModeRejected");
 }
 
 void NativeDisplayEventReceiver::dispatchFrameRateOverrides(
@@ -313,7 +315,7 @@
         ALOGV("receiver %p ~ Returned from FrameRateOverride handler.", this);
     }
 
-    mMessageQueue->raiseAndClearException(env, "dispatchModeChanged");
+    mMessageQueue->raiseAndClearException(env, "dispatchFrameRateOverrides");
 }
 
 void NativeDisplayEventReceiver::dispatchHdcpLevelsChanged(PhysicalDisplayId displayId,