From a35993b83fa98037755d11c19bac53c546f744bd Mon Sep 17 00:00:00 2001
From: Bin Zhai <ot_bin.zhai@mediatek.com>
Date: Tue, 9 May 2023 17:08:54 +0800
Subject: [PATCH 1/2] Create new SurfaceControl.Transaction when old closed

The SurfaceControl.Transaction will be closed after use. If TransactionCommittedListener can not be called in time, sytem_server will crash when merge Transaction.

Bug: 281823781
Test: run monkey test pass

Change-Id: I68d9809aaebc3a217b0c5287323c65c4f9fd05b9
---
 .../core/java/com/android/server/wm/BLASTSyncEngine.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java
index 778951a545fa7..98ee98ba67f74 100644
--- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java
+++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java
@@ -248,7 +248,10 @@ class BLASTSyncEngine {
                     Slog.e(TAG, "WM sent Transaction to organized, but never received" +
                            " commit callback. Application ANR likely to follow.");
                     Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
-                    onCommitted(merged);
+                    synchronized (mWm.mGlobalLock) {
+                        onCommitted(merged.mNativeObject != 0
+                                ? merged : mWm.mTransactionFactory.get());
+                    }
                 }
             };
             CommitCallback callback = new CommitCallback();

From 20a131fe3be17aad65e00d39446fcd7b6723f1ba Mon Sep 17 00:00:00 2001
From: Emilian Peev <epeev@google.com>
Date: Fri, 12 May 2023 17:40:12 -0700
Subject: [PATCH 2/2] Camera: Improve error handling of device state listeners

Do not register characteristic fold state listeners in
case the DeviceStateManager fails to register the main
device state callback. This is possible in case we are
running in instant mode and can impact the correctness of
the characteristics override logic.

Bug: 281930689
Test:
atest --instant
cts/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java#testLegacyCameraDeviceParity
atest
cts/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java#testLegacyCameraDeviceParity

Change-Id: I53908508c5dd7375663cf37fc18522b1cea12e5e
---
 .../camera2/CameraCharacteristics.java        | 22 +++++++++++--------
 .../hardware/camera2/CameraManager.java       |  1 +
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index e908ced06acd5..48b5cac2a5191 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -212,14 +212,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     @GuardedBy("mLock")
     private boolean mFoldedDeviceState;
 
-    private final CameraManager.DeviceStateListener mFoldStateListener =
-            new CameraManager.DeviceStateListener() {
-                @Override
-                public final void onDeviceStateChanged(boolean folded) {
-                    synchronized (mLock) {
-                        mFoldedDeviceState = folded;
-                    }
-                }};
+    private CameraManager.DeviceStateListener mFoldStateListener;
 
     private static final String TAG = "CameraCharacteristics";
 
@@ -245,7 +238,18 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     /**
      * Return the device state listener for this Camera characteristics instance
      */
-    CameraManager.DeviceStateListener getDeviceStateListener() { return mFoldStateListener; }
+    CameraManager.DeviceStateListener getDeviceStateListener() {
+        if (mFoldStateListener == null) {
+            mFoldStateListener = new CameraManager.DeviceStateListener() {
+                        @Override
+                        public final void onDeviceStateChanged(boolean folded) {
+                            synchronized (mLock) {
+                                mFoldedDeviceState = folded;
+                            }
+                        }};
+        }
+        return mFoldStateListener;
+    }
 
     /**
      * Overrides the property value
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index c6fc69efb85cf..44a82963ecaff 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -1811,6 +1811,7 @@ public final class CameraManager {
                         ctx.getSystemService(DeviceStateManager.class).registerCallback(
                                 new HandlerExecutor(mDeviceStateHandler), mFoldStateListener);
                     } catch (IllegalStateException e) {
+                        mFoldStateListener = null;
                         Log.v(TAG, "Failed to register device state listener!");
                         Log.v(TAG, "Device state dependent characteristics updates will not be" +
                                 "functional!");