From 4da02059e884dbef897f410861329acad96d46d4 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Tue, 6 Dec 2011 14:21:54 +0800 Subject: Fix crash after restoring defaults. After restoring defaults in camcorder mode, the indicator control calls onSharedPreferenceChanged if record location is on. onSharedPreferenceChanged is also called in the end of restorePreferences. With two onSharedPreferenceChanged calls in a row, the first call notices effects have been disabled, and begins the effect pipeline teardown in the background thread. Normally, this would conclude in a few hundred milliseconds, and would then restart regular preview. However, with the second call to onSharedPreferenceChanged coming in right after the first, the method no longer sees an effect transition in progress (since current and new effect are equal to none now), and thus just ends up restarting preview. That attempt at restart runs into the crash because the main SurfaceView has not yet been released by the background effects thread. To fix this, InLineSettingSwitch should not invoke the listener when updating UI. bug:5679133 Change-Id: I06aca382105455585b633dc63f014a8f71ccadbe --- src/com/android/camera/ui/InLineSettingSwitch.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/com/android/camera/ui/InLineSettingSwitch.java b/src/com/android/camera/ui/InLineSettingSwitch.java index 8fc37da..20efc0c 100644 --- a/src/com/android/camera/ui/InLineSettingSwitch.java +++ b/src/com/android/camera/ui/InLineSettingSwitch.java @@ -57,13 +57,16 @@ public class InLineSettingSwitch extends InLineSettingItem { R.string.accessibility_switch, mPreference.getTitle())); } + @Override protected void updateView() { + mSwitch.setOnCheckedChangeListener(null); if (mOverrideValue == null) { mSwitch.setChecked(mIndex == 1); } else { int index = mPreference.findIndexOfValue(mOverrideValue); mSwitch.setChecked(index == 1); } + mSwitch.setOnCheckedChangeListener(mCheckedChangeListener); } @Override -- cgit v1.1