diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2015-10-05 17:48:45 -0700 |
|---|---|---|
| committer | Jaimin Bhise <jbhise@codeaurora.org> | 2015-10-29 14:04:57 -0700 |
| commit | 454942261d26f4babd064f0c3e8459670abbab4a (patch) | |
| tree | dbd1777812e4fa9f3b33eabdba9bc70f83570ee3 | |
| parent | fa3146bccdccfc8ac43e6778915c74e571e13e63 (diff) | |
| download | android_packages_apps_Snap-454942261d26f4babd064f0c3e8459670abbab4a.tar.gz android_packages_apps_Snap-454942261d26f4babd064f0c3e8459670abbab4a.tar.bz2 android_packages_apps_Snap-454942261d26f4babd064f0c3e8459670abbab4a.zip | |
Revert "SnapdragonCamera: fix screen flash on resuming"
This reverts commit 37856d6b3bcede0eb514e83d168d24b5f66d21c5.
Change-Id: Ie16e324fb66b07deedf74dc2d3abefea607d92a0
| -rw-r--r-- | src/com/android/camera/AndroidCameraManagerImpl.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/CameraManager.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 |
3 files changed, 1 insertions, 19 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index 86a8b3e08..c1ae81159 100644 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -74,7 +74,6 @@ class AndroidCameraManagerImpl implements CameraManager { private static final int ADD_CALLBACK_BUFFER = 105; private static final int SET_PREVIEW_DISPLAY_ASYNC = 106; private static final int SET_PREVIEW_CALLBACK = 107; - private static final int SET_ONESHOT_PREVIEW_CALLBACK = 108; // Parameters private static final int SET_PARAMETERS = 201; private static final int GET_PARAMETERS = 202; @@ -350,9 +349,6 @@ class AndroidCameraManagerImpl implements CameraManager { mCamera.setPreviewCallback((PreviewCallback) msg.obj); return; - case SET_ONESHOT_PREVIEW_CALLBACK: - mCamera.setOneShotPreviewCallback((PreviewCallback) msg.obj); - case ENABLE_SHUTTER_SOUND: enableShutterSound((msg.arg1 == 1) ? true : false); return; @@ -512,13 +508,6 @@ class AndroidCameraManagerImpl implements CameraManager { } @Override - public void setOneShotPreviewCallback(Handler handler, CameraPreviewDataCallback cb) { - mCameraHandler.obtainMessage( - SET_ONESHOT_PREVIEW_CALLBACK, - PreviewCallbackForward.getNewInstance(handler, this, cb)).sendToTarget(); - } - - @Override public void addCallbackBuffer(byte[] callbackBuffer) { mCameraHandler.obtainMessage(ADD_CALLBACK_BUFFER, callbackBuffer).sendToTarget(); } diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java index 7f59975df..4feb8ac05 100644 --- a/src/com/android/camera/CameraManager.java +++ b/src/com/android/camera/CameraManager.java @@ -249,7 +249,6 @@ public interface CameraManager { */ public void setPreviewDataCallbackWithBuffer(Handler handler, CameraPreviewDataCallback cb); - public void setOneShotPreviewCallback(Handler handler, CameraPreviewDataCallback cb); /** * Adds buffer for the preview callback. * diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c9454228a..d9087a281 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -535,6 +535,7 @@ public class PhotoModule if (mCameraState == SNAPSHOT_IN_PROGRESS) { return; } + mUI.hidePreviewCover(); setCameraState(IDLE); mFocusManager.onPreviewStarted(); startFaceDetection(); @@ -2677,13 +2678,6 @@ public class PhotoModule setCameraParameters(UPDATE_PARAM_ALL); mCameraDevice.startPreview(); - mCameraDevice.setOneShotPreviewCallback(mHandler, - new CameraManager.CameraPreviewDataCallback() { - @Override - public void onPreviewFrame(byte[] data, CameraProxy camera) { - mUI.hidePreviewCover(); - } - }); mHandler.sendEmptyMessage(ON_PREVIEW_STARTED); setDisplayOrientation(); |