am 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode.

Merge commit '53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-mr2

* commit '53dcdeeb85e523e0b752d802d3413f5d4001d575':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.

src/com/android/settings/BrightnessPreference.java

@@ -120,10 +120,11 @@ public class BrightnessPreference extends SeekBarPreference implements
             if (mAutomaticAvailable) {
                 setMode(mOldAutomatic);
             }
-            // brightness needs to be restored after restoring ALS mode
+            if (!mAutomaticAvailable || mOldAutomatic == 0) {
                 setBrightness(mOldBrightness);
             }
         }
+    }
     
     private void setBrightness(int brightness) {
         try {