From f08fbba20b8f9907c2149f2adbef3ab19422d2a2 Mon Sep 17 00:00:00 2001
From: zhangxinlogo <1922882393@qq.com>
Date: Wed, 16 Jun 2021 14:30:16 +0800
Subject: [PATCH] fix stability bug

Signed-off-by: zhangxinlogo <1922882393@qq.com>
---
 .../samples/dataability/slice/MainAbilitySlice.java  | 12 +++++++-----
 .../java/ohos/samples/camera/VideoRecordAbility.java |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java b/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java
index cbd768a236..432ae55821 100644
--- a/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java
+++ b/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java
@@ -151,16 +151,18 @@ public class MainAbilitySlice extends AbilitySlice {
         try {
             ResultSet resultSet = databaseHelper.query(Uri.parse(Const.BASE_URI + Const.DATA_PATH), columns,
                 predicates);
-            if (resultSet.getRowCount() == 0) {
+            if (!resultSet.goToFirstRow()) {
                 HiLog.info(LABEL_LOG, "%{public}s", "query:No result found");
                 return;
             }
-            resultSet.goToFirstRow();
             logText.setText("");
+            int nameIndex = resultSet.getColumnIndexForName(Const.DB_COLUMN_NAME);
+            int ageIndex = resultSet.getColumnIndexForName(Const.DB_COLUMN_AGE);
+            int userIndex = resultSet.getColumnIndexForName(Const.DB_COLUMN_USER_ID);
             do {
-                String name = resultSet.getString(resultSet.getColumnIndexForName(Const.DB_COLUMN_NAME));
-                int age = resultSet.getInt(resultSet.getColumnIndexForName(Const.DB_COLUMN_AGE));
-                int userId = resultSet.getInt(resultSet.getColumnIndexForName(Const.DB_COLUMN_USER_ID));
+                String name = resultSet.getString(nameIndex);
+                int age = resultSet.getInt(ageIndex);
+                int userId = resultSet.getInt(userIndex);
                 logText.append(userId + "   " + name + "   " + age + System.lineSeparator());
             } while (resultSet.goToNextRow());
         } catch (DataAbilityRemoteException | IllegalStateException exception) {
diff --git a/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java b/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java
index 0b30d63b6f..361f364aa4 100644
--- a/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java
+++ b/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java
@@ -160,6 +160,9 @@ public class VideoRecordAbility extends Ability {
 
     private void switchCamera(Component component) {
         isFrontCamera = !isFrontCamera;
+        if (cameraDevice != null) {
+            cameraDevice.release();
+        }
         updateComponentVisible(false);
         openCamera();
     }
-- 
Gitee