Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d278ffc0 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 96e0c315: Merge change Ia3f7ef64 into eclair 

Merge commit '96e0c315' into eclair-mr2

* commit '96e0c315':
  PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
parents 96f225af 96e0c315

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

+8 −6
Original line number Diff line number Diff line
@@ -2007,6 +2007,7 @@ class PowerManagerService extends IPowerManager.Stub 
            if (mSpew) {

                Log.d(TAG, "setKeyboardVisibility: " + visible);

            }

            if (mKeyboardVisible != visible) {

                mKeyboardVisible = visible;

                // don't signal user activity if the screen is off; other code

                // will take care of turning on due to a true change to the lid
@@ -2016,6 +2017,7 @@ class PowerManagerService extends IPowerManager.Stub 
                }

            }

        }

    }



    /**

     * When the keyguard is up, it manages the power state, and userActivity doesn't do anything.