| commit | 5202eaaa5f5e898c84f33d8c8023a427ca01d517 | [log] [tgz] |
|---|---|---|
| author | Chih-Chung Chang <chihchung@google.com> | Thu Mar 25 10:05:58 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 25 10:05:58 2010 -0700 |
| tree | 6c9a2c259cfaabc4246e9eb0ea2dd2dab4a4054a | |
| parent | f4264011c0e5c52f29627f2489aeabe67eff66a4 [diff] | |
| parent | cfea8fda1291feab9b04a1c99824d1a3965782a8 [diff] |
Merge "Call unlinkToDeath() when we disconnect the Camera, so we don't hold the (weak) reference to it, which caused (small) memory leaks."
diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp index 8620e71..f19c502 100644 --- a/libs/camera/Camera.cpp +++ b/libs/camera/Camera.cpp
@@ -117,6 +117,7 @@ LOGV("disconnect"); if (mCamera != 0) { mCamera->disconnect(); + mCamera->asBinder()->unlinkToDeath(this); mCamera = 0; } }