summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
authorqimengp <qimengp@codeaurora.org>2016-09-13 16:53:13 +0800
committerJay Wang <jaywang@codeaurora.org>2016-09-27 10:33:04 -0700
commit94df9e6541dd5b303477e7cf0709efccfa4af4b7 (patch)
tree063f6f4b76443aafcbf1cc3436f01e02784b637c /src/com/android/camera/PhotoModule.java
parentaee79a802c9606d16d562b47e6c629967a5047da (diff)
downloadandroid_packages_apps_Snap-94df9e6541dd5b303477e7cf0709efccfa4af4b7.tar.gz
android_packages_apps_Snap-94df9e6541dd5b303477e7cf0709efccfa4af4b7.tar.bz2
android_packages_apps_Snap-94df9e6541dd5b303477e7cf0709efccfa4af4b7.zip
SnapdragonCamera: Fix ANR during open camera
When preview UI destory, app call Camera API as order: setPreviewDispaly(null) and stopPreview(). In case native window disconnected before stopPreview(), will cause ANR, since calling to native window fails. Native window is taken care within camera framework. So, by removing setPreviewDisplay(null), can avoid this issue. Change-Id: Id804f2e0876a61d974e58dd996c46fe769f69856
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rwxr-xr-x[-rw-r--r--]src/com/android/camera/PhotoModule.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 0d0161bc6..f83dda1d5 100644..100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -699,7 +699,6 @@ public class PhotoModule
} catch (InterruptedException ex) {
// ignore
}
- mCameraDevice.setPreviewDisplay(null);
stopPreview();
}