From 65f49474d69ab867d048fc2d6c53d456e585101f Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Wed, 16 Sep 2009 06:20:22 -0400
Subject: [PATCH] Restore backlight brightness after restoring auto ALS mode.

Fixes b/2121632

Change-Id: I14228a4fd1d599de1e5fdbb3c8b4b3c02a1460ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 src/com/android/settings/BrightnessPreference.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index e2fe0f2240e..2bba8148734 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -121,10 +121,11 @@ public class BrightnessPreference extends SeekBarPreference implements
                         mCheckBox.isChecked() ? 1 : 0);
             }
         } else {
-            setBrightness(mOldBrightness);
             if (mAutomaticAvailable) {
                 setMode(mOldAutomatic);
             }
+            // brightness needs to be restored after restoring ALS mode
+            setBrightness(mOldBrightness);
         }
     }