Snap for 13219462 from a3cf2962a4c924cf2c320c1351534c17074a405a to 25Q2-release

Change-Id: I887a72872f80bbfc16d76eac37f2ee90d2d3df46

2 files changed, 2 insertions, 2 deletions

diff --git a/framework/java/android/net/wifi/rtt/ResponderConfig.java b/framework/java/android/net/wifi/rtt/ResponderConfig.java
index ffa98499ed..7d950eeabd 100644
--- a/framework/java/android/net/wifi/rtt/ResponderConfig.java
+++ b/framework/java/android/net/wifi/rtt/ResponderConfig.java
@@ -1074,7 +1074,7 @@ public final class ResponderConfig implements Parcelable {
             if (secureRangingConfig != null) {
                 builder.setSecureRangingConfig(secureRangingConfig);
             }
-            return builder.build();
+            return new ResponderConfig(builder);
 
         }
     };
diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
index 227ca28f13..9a0bf0ae64 100644
--- a/service/java/com/android/server/wifi/HalDeviceManager.java
+++ b/service/java/com/android/server/wifi/HalDeviceManager.java
@@ -1584,7 +1584,7 @@ public class HalDeviceManager {
         @Override
         public void onSubsystemRestart(int status) {
             Log.i(TAG, "onSubsystemRestart");
-            mEventHandler.post(() -> {
+            mEventHandler.postAtFrontOfQueue(() -> {
                 Log.i(TAG, "IWifiEventCallback.onSubsystemRestart. Status: " + status);
                 synchronized (mLock) {
                     Log.i(TAG, "Attempting to invoke mSubsystemRestartListener");