diff options
| author | Camera Software Integration <camswint@quicinc.com> | 2020-03-23 23:43:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-03-23 23:43:04 -0700 |
| commit | 3c2221c39b787306afc68cb9fa975d43bfa5f3db (patch) | |
| tree | 2a414808493278d5895fb664f14aeabd92015606 /src/com/android/camera/CaptureModule.java | |
| parent | 7809929287b66fbcd57c556810fe7c70ff726f1d (diff) | |
| parent | 4a8e7a2090dfe6802dacf4a8ef6a4719c6f50b1c (diff) | |
Merge "snapcam: restore cameraIds" into camera-SnapdragonCamera.lnx.3.1
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index bf4ee236b..8490b371b 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2332,6 +2332,7 @@ public class CaptureModule implements CameraModule, PhotoController, mActivity = activity; mRootView = parent; mSettingsManager = SettingsManager.getInstance(); + mSettingsManager.createCaptureModule(this); mSettingsManager.registerListener(this); mSettingsManager.init(); mFirstPreviewLoaded = false; @@ -2362,6 +2363,10 @@ public class CaptureModule implements CameraModule, PhotoController, mLocationManager = new LocationManager(mActivity, this); } + public void restoreCameraIds(){ + CURRENT_ID = mCurrentSceneMode.getCurrentId(); + } + private void initCameraIds() { CameraManager manager = (CameraManager) mActivity.getSystemService(Context.CAMERA_SERVICE); boolean isFirstDefault = true; @@ -4518,6 +4523,7 @@ public class CaptureModule implements CameraModule, PhotoController, } mSettingsManager.unregisterListener(this); mSettingsManager.unregisterListener(mUI); + mSettingsManager.destroyCaptureModule(); } @Override |