commit 98a3e7b6d00b2a1f9889bfb207562d72d78f80c7
author Joshua Lang <joshualang@google.com> Fri Sep 16 11:06:02 2016 -0700
committer Joshua Lang <joshualang@google.com> Tue Jan 03 18:49:33 2017 -0800
tree 22698d87599857f72a597831cea0bff5f1c69ed2
parent bffb70b3f0625fa077402edf9ff46ddc751e6401

Re-initialize emulated camera settings on cleanup

CTS tests may be expecting certain configuration when starting up
camera. Bring camera back to default on cleanup.

Test: Run CtsCamera module twice
Bug: 31377597
Change-Id: I37436699caf8c56e5a546efb7a947ffd88b01d99
(cherry picked from commit 8b694ac0ef218391dc65ec056c16065ca4ffecbc)

camera/EmulatedCamera.cpp

diff --git a/camera/EmulatedCamera.cpp b/camera/EmulatedCamera.cpp
index 096c5b2..64abbc2 100755
--- a/camera/EmulatedCamera.cpp
+++ b/camera/EmulatedCamera.cpp
@@ -675,6 +675,9 @@
 
     mCallbackNotifier.cleanupCBNotifier();
 
+    /* Re-init the camera settings in case settings were changed */
+    Initialize();
+
     return NO_ERROR;
 }