Commit: c7a2095139f6efc634b7063d43b3b3c26a9d6a99 - packages-apps-Camera2 (git)

packages/apps/Camera2

Commit MetaInfo

• Revision: c7a2095139f6efc634b7063d43b3b3c26a9d6a99 (tree)
• Time: 2018-05-30 04:23:56
• Author: Treehugger Robot <treehugger-gerrit@goog...>
• Commiter: Gerrit Code Review

Log Message

Merge "Fix a mistake of CameraAgentFactory's recycle();"

Change Summary

• modified: src/com/android/camera/CameraActivity.java
• modified: src/com/android/camera/settings/AppUpgrader.java
• modified: src/com/android/camera/settings/CameraSettingsActivity.java
• modified: src/com/android/camera/settings/PictureSizeLoader.java

Incremental Difference

--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1503,7 +1503,9 @@ public class CameraActivity extends QuickActivity
         // version.
         profile.mark();
         try {
-            (new PictureSizeLoader(mAppContext)).computePictureSizes();
+            PictureSizeLoader pictureSizeLoader = new PictureSizeLoader(mAppContext);
+            pictureSizeLoader.computePictureSizes();
+            pictureSizeLoader.release();
         } catch (AssertionError e) {
             Log.e(TAG, "Creating camera controller failed.", e);
             mFatalErrorHandler.onGenericCameraAccessFailure();

--- a/src/com/android/camera/settings/AppUpgrader.java
+++ b/src/com/android/camera/settings/AppUpgrader.java
@@ -145,6 +145,7 @@ public class AppUpgrader extends SettingsUpgrader {
             // chooser if applicable.
             settingsManager.remove(SettingsManager.SCOPE_GLOBAL,
                     Keys.KEY_STARTUP_MODULE_INDEX);
+            CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
         }
 
         if (lastVersion < CAMERA_MODULE_SETTINGS_FILES_RENAMED_VERSION) {

--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -180,6 +180,7 @@ public class CameraSettingsActivity extends FragmentActivity {
             mInfos = CameraAgentFactory
                     .getAndroidCameraAgent(context, CameraAgentFactory.CameraApi.API_1)
                     .getCameraDeviceInfo();
+            CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
         }
 
         @Override
@@ -498,6 +499,7 @@ public class CameraSettingsActivity extends FragmentActivity {
             }
             PictureSizeLoader loader = new PictureSizeLoader(getActivity().getApplicationContext());
             mPictureSizes = loader.computePictureSizes();
+            loader.release();
         }
 
         /**

--- a/src/com/android/camera/settings/PictureSizeLoader.java
+++ b/src/com/android/camera/settings/PictureSizeLoader.java
@@ -97,6 +97,10 @@ public class PictureSizeLoader {
         mCachedOnly = cachedOnly;
     }
 
+    public void release(){
+        CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
+    }
+
     /**
      * Computes the list of picture sizes that should be displayed by settings.
      * <p>