Merge "Fix missing lock in power manager."

            new DisplayPowerController.Callbacks() {

        @Override

        public void onStateChanged() {

            synchronized (mLock) {

                mDirty |= DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED;

                updatePowerStateLocked();

            }

        }

        @Override

        public void onProximityPositive() {

            synchronized (mLock) {

                mProximityPositive = true;

                mDirty |= DIRTY_PROXIMITY_POSITIVE;

                updatePowerStateLocked();

            }

        }

        @Override

        public void onProximityNegative() {

            synchronized (mLock) {

                mProximityPositive = false;

                mDirty |= DIRTY_PROXIMITY_POSITIVE;

                userActivityNoUpdateLocked(SystemClock.uptimeMillis(),

                        PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID);

                updatePowerStateLocked();

            }

        }

    };

    private boolean shouldUseProximitySensorLocked() {