SettingsManager: reload characteristics as soon as possible
If we reload characteristics after `autoTestBroadcast`, we can
end up with a concurrent modification exception, as the auto test
spawns a new thread.
Change-Id: I6aec541fec2669696882aa1a69fbec37837d54ec
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index dc821e6..423574b 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -410,9 +410,9 @@
public void init() {
Log.d(TAG, "SettingsManager init");
final int cameraId = getInitialCameraId(mPreferences);
+ reloadCharacteristics(cameraId);
setLocalIdAndInitialize(cameraId);
autoTestBroadcast(cameraId);
- reloadCharacteristics(cameraId);
}
public void reinit(int cameraId) {