summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-04-25 00:48:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-25 00:48:26 +0000
commit998ee16570e541e74e90eac39f468e6d8d1cd6f8 (patch)
treec069e8e5f6a3f013cb176cd203826e52760fa8af
parentb423e300f77de90aea34321ef7f67882d4e526ed (diff)
parent6faf98e235aa58e721ffce37e36e6f433592d3cc (diff)
downloadframeworks_base-998ee16570e541e74e90eac39f468e6d8d1cd6f8.zip
frameworks_base-998ee16570e541e74e90eac39f468e6d8d1cd6f8.tar.gz
frameworks_base-998ee16570e541e74e90eac39f468e6d8d1cd6f8.tar.bz2
Merge "camera: Start/stop preview before clearing surface."
-rw-r--r--core/java/android/hardware/camera2/legacy/RequestThreadManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
index 691798f..a4d6be0 100644
--- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
+++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
@@ -326,6 +326,9 @@ public class RequestThreadManager {
}
try {
+ startPreview(); // If preview is not running (i.e. after a JPEG capture), we need to
+ // explicitely start and stop preview before setting preview surface.
+ // null.
stopPreview();
} catch (RuntimeException e) {
Log.e(TAG, "Received device exception in configure call: ", e);