packages/apps/Camera2
修订版 | c7a2095139f6efc634b7063d43b3b3c26a9d6a99 (tree) |
---|---|
时间 | 2018-05-30 04:23:56 |
作者 | Treehugger Robot <treehugger-gerrit@goog...> |
Commiter | Gerrit Code Review |
Merge "Fix a mistake of CameraAgentFactory's recycle();"
@@ -1503,7 +1503,9 @@ public class CameraActivity extends QuickActivity | ||
1503 | 1503 | // version. |
1504 | 1504 | profile.mark(); |
1505 | 1505 | try { |
1506 | - (new PictureSizeLoader(mAppContext)).computePictureSizes(); | |
1506 | + PictureSizeLoader pictureSizeLoader = new PictureSizeLoader(mAppContext); | |
1507 | + pictureSizeLoader.computePictureSizes(); | |
1508 | + pictureSizeLoader.release(); | |
1507 | 1509 | } catch (AssertionError e) { |
1508 | 1510 | Log.e(TAG, "Creating camera controller failed.", e); |
1509 | 1511 | mFatalErrorHandler.onGenericCameraAccessFailure(); |
@@ -145,6 +145,7 @@ public class AppUpgrader extends SettingsUpgrader { | ||
145 | 145 | // chooser if applicable. |
146 | 146 | settingsManager.remove(SettingsManager.SCOPE_GLOBAL, |
147 | 147 | Keys.KEY_STARTUP_MODULE_INDEX); |
148 | + CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1); | |
148 | 149 | } |
149 | 150 | |
150 | 151 | if (lastVersion < CAMERA_MODULE_SETTINGS_FILES_RENAMED_VERSION) { |
@@ -180,6 +180,7 @@ public class CameraSettingsActivity extends FragmentActivity { | ||
180 | 180 | mInfos = CameraAgentFactory |
181 | 181 | .getAndroidCameraAgent(context, CameraAgentFactory.CameraApi.API_1) |
182 | 182 | .getCameraDeviceInfo(); |
183 | + CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1); | |
183 | 184 | } |
184 | 185 | |
185 | 186 | @Override |
@@ -498,6 +499,7 @@ public class CameraSettingsActivity extends FragmentActivity { | ||
498 | 499 | } |
499 | 500 | PictureSizeLoader loader = new PictureSizeLoader(getActivity().getApplicationContext()); |
500 | 501 | mPictureSizes = loader.computePictureSizes(); |
502 | + loader.release(); | |
501 | 503 | } |
502 | 504 | |
503 | 505 | /** |
@@ -97,6 +97,10 @@ public class PictureSizeLoader { | ||
97 | 97 | mCachedOnly = cachedOnly; |
98 | 98 | } |
99 | 99 | |
100 | + public void release(){ | |
101 | + CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1); | |
102 | + } | |
103 | + | |
100 | 104 | /** |
101 | 105 | * Computes the list of picture sizes that should be displayed by settings. |
102 | 106 | * <p> |