diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp
index a1ffb371..cf981720 100644
--- a/src/android/camera_hal_manager.cpp
+++ b/src/android/camera_hal_manager.cpp
@@ -90,6 +90,10 @@ void CameraHalManager::run()
 
 	/* Now start processing events and messages. */
 	exec();
+
+	/* Clean up the resources we have allocated. */
+	proxies_.clear();
+	cameraManager_->stop();
 }
 
 CameraProxy *CameraHalManager::open(unsigned int id,