Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 96e0c315: Merge change Ia3f7ef64 into eclair

Browse Source 
Merge commit '96e0c3156e21bbdb0d94201b08d80379b98c472a' into eclair-mr2

* commit '96e0c3156e21bbdb0d94201b08d80379b98c472a':
  PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
This commit is contained in:
Mike Lockwood
2009-10-22 13:31:37 -07:00
committed by Android Git Automerger
parent 96f225afad 96e0c3156e
commit d278ffc098
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/PowerManagerService.java
View File

@@ -2007,6 +2007,7 @@ class PowerManagerService extends IPowerManager.Stub
if (mSpew) { if (mSpew) {
Log.d(TAG, "setKeyboardVisibility: " + visible); Log.d(TAG, "setKeyboardVisibility: " + visible);
} }
if (mKeyboardVisible != visible) {
mKeyboardVisible = visible; mKeyboardVisible = visible;
// don't signal user activity if the screen is off; other code // 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 // 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. * When the keyguard is up, it manages the power state, and userActivity doesn't do anything.