commit 46f31c31ea76e8f8a835abbc6a2929ab0b929965
author Jim Miller <jaggies@google.com> Thu Mar 01 14:36:07 2012 -0800
committer Jim Miller <jaggies@google.com> Thu Mar 01 14:56:47 2012 -0800
tree eb12e15966e39173326fa94d873180bd37d8b973
parent 3f4b1c4d582394646043f1a67527ed3e9f999e1b

Fix 5797764: fix crash on tablets

This fixes a crash on tablets introduced by Change Ifad76fb2. It was caused
by calling nativeStartSurfaceFlingerAnimation() on devices that previously
didn't call it and apparently don't support some feature it uses.

Change-Id: Ia4c04e7e611f45cde0fbeb861aec3435d1719552

services/java/com/android/server/PowerManagerService.java

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 0f7580d..c8f49ee 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -161,6 +161,7 @@
     // used for noChangeLights in setPowerState()
     private static final int LIGHTS_MASK        = SCREEN_BRIGHT_BIT | BUTTON_BRIGHT_BIT | KEYBOARD_BRIGHT_BIT;
 
+    // animate screen lights in PowerManager (as opposed to SurfaceFlinger)
     boolean mAnimateScreenLights = true;
 
     static final int ANIM_STEPS = 60; // nominal # of frames at 60Hz
@@ -1716,6 +1717,7 @@
                             + Integer.toHexString(mPowerState)
                             + " mSkippedScreenOn=" + mSkippedScreenOn);
                 }
+                mScreenBrightnessHandler.removeMessages(ScreenBrightnessAnimator.ANIMATE_LIGHTS);
                 mScreenBrightnessAnimator.animateTo(Power.BRIGHTNESS_OFF, SCREEN_BRIGHT_BIT, 0);
             }
         }
@@ -2113,7 +2115,7 @@
      */
     class ScreenBrightnessAnimator extends HandlerThread {
         static final int ANIMATE_LIGHTS = 10;
-        static final int POWER_OFF = 11;
+        static final int ANIMATE_POWER_OFF = 11;
         volatile int startValue;
         volatile int endValue;
         volatile int currentValue;
@@ -2161,11 +2163,9 @@
                             currentValue = value;
                         }
                         animateInternal(mask, false, delay);
-                    } else if (msg.what == POWER_OFF) {
-                        if (!mHeadless) {
-                            int mode = msg.arg1;
-                            nativeStartSurfaceFlingerAnimation(mode);
-                        }
+                    } else if (msg.what == ANIMATE_POWER_OFF) {
+                        int mode = msg.arg1;
+                        nativeStartSurfaceFlingerAnimation(mode);
                     }
                 }
             };
@@ -2198,11 +2198,12 @@
                                 + ", delay:" + delay);
                     }
 
-                    if (turningOff) {
+                    if (turningOff && !mHeadless && !mAnimateScreenLights) {
                         int mode = mScreenOffReason == OFF_BECAUSE_OF_PROX_SENSOR
                                 ? 0 : mAnimationSetting;
                         if (mDebugLightAnimation) Log.v(TAG, "Doing power-off anim, mode=" + mode);
-                        mScreenBrightnessHandler.obtainMessage(POWER_OFF, mode, 0).sendToTarget();
+                        mScreenBrightnessHandler.obtainMessage(ANIMATE_POWER_OFF, mode, 0)
+                                .sendToTarget();
                     }
                     Message msg = mScreenBrightnessHandler
                             .obtainMessage(ANIMATE_LIGHTS, mask, newValue);