From 16cbb942c600aab524c49bdcec7227607369e6e9 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Wed, 1 Nov 2023 04:41:09 +0800
Subject: Fixed camera flaky issue in monkey testing

- Cache RuntimeException when stop previewing camera failed

Fix: 306606307
Test: unit test
make RunSettingsLibRoboTests

Change-Id: Ia05f7c528b6e74f755ca2cf81bbfbb7bc37f4f7a
---
 .../SettingsLib/src/com/android/settingslib/qrcode/QrCamera.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/qrcode/QrCamera.java b/packages/SettingsLib/src/com/android/settingslib/qrcode/QrCamera.java
index e65109003856..ae17acb5104b 100644
--- a/packages/SettingsLib/src/com/android/settingslib/qrcode/QrCamera.java
+++ b/packages/SettingsLib/src/com/android/settingslib/qrcode/QrCamera.java
@@ -116,8 +116,13 @@ public class QrCamera extends Handler {
             mDecodeTask = null;
         }
         if (mCamera != null) {
-            mCamera.stopPreview();
-            releaseCamera();
+            try {
+                mCamera.stopPreview();
+                releaseCamera();
+            } catch (RuntimeException e) {
+                Log.e(TAG, "Stop previewing camera failed:" + e);
+                mCamera = null;
+            }
         }
     }
 
-- 
cgit v1.2.3-59-g8ed1b