Fix merge problem

                        mScreenOffHandler.postAtTime(this, now+(1000/60));

                    }

                } else {

                    if (!mHeadless) {

                        // It's pretty scary to hold mLocks for this long, and we should

                        // redesign this, but it works for now.

                        nativeStartSurfaceFlingerAnimation(

                                mScreenOffReason == WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR

                                ? 0 : mAnimationSetting);

                    }

                    mScreenBrightness.jumpToTargetLocked();

                }

            }