summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-09-01 08:58:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-01 08:58:32 -0700
commit84284e7a4e8d7f781f3a90605047aea1bb21dbf6 (patch)
treef45de58ac77edc412426bdb4dead27253aa8c824 /services
parent1040127473ee48c1c3b8c279ae05d38dbfb6e4c2 (diff)
parent3abe8d29864d3e8a9f40be43e5faa10e57a4fac5 (diff)
downloadframeworks_av-84284e7a4e8d7f781f3a90605047aea1bb21dbf6.zip
frameworks_av-84284e7a4e8d7f781f3a90605047aea1bb21dbf6.tar.gz
frameworks_av-84284e7a4e8d7f781f3a90605047aea1bb21dbf6.tar.bz2
Merge "Remove setPreviewDisplay in CameraService::Client::~Client()."
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index c6a9909..d1fbf17 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -336,11 +336,6 @@ CameraService::Client::~Client() {
int callingPid = getCallingPid();
LOG1("Client::~Client E (pid %d, this %p)", callingPid, this);
- // Clean up the ANativeWindow
- if (mSurface != 0) {
- setPreviewDisplay(0);
- }
-
// set mClientPid to let disconnet() tear down the hardware
mClientPid = callingPid;
disconnect();