drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread

Browse Source 
Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp

* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
  Don't throw when userActivity fails because of the permission check.
This commit is contained in:
Joe Onorato
2010-10-11 13:55:15 -07:00
committed by Android Git Automerger
parent 2af4c51e9a 446547af37
commit 5be893a71a
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,8 @@ class PowerManagerService extends IPowerManager.Stub
private int[] mButtonBacklightValues; private int[] mButtonBacklightValues;
private int[] mKeyboardBacklightValues; private int[] mKeyboardBacklightValues;
private int mLightSensorWarmupTime; private int mLightSensorWarmupTime;
private int mWarningSpewThrottleCount;
private long mWarningSpewThrottleTime;
// Used when logging number and duration of touch-down cycles // Used when logging number and duration of touch-down cycles
private long mTotalTouchDownTime; private long mTotalTouchDownTime;
@ -2095,6 +2097,21 @@ class PowerManagerService extends IPowerManager.Stub
return (mScreenBrightness.animating && mScreenBrightness.targetValue == 0); return (mScreenBrightness.animating && mScreenBrightness.targetValue == 0);
} }
private boolean shouldLog(long time) {
synchronized (mLocks) {
if (time > (mWarningSpewThrottleTime + (60*60*1000))) {
mWarningSpewThrottleTime = time;
mWarningSpewThrottleCount = 0;
return true;
} else if (mWarningSpewThrottleCount < 30) {
mWarningSpewThrottleCount++;
return true;
} else {
return false;
}
}
}
private void forceUserActivityLocked() { private void forceUserActivityLocked() {
if (isScreenTurningOffLocked()) { if (isScreenTurningOffLocked()) {
// cancel animation so userActivity will succeed // cancel animation so userActivity will succeed
@ -2112,7 +2129,15 @@ class PowerManagerService extends IPowerManager.Stub
} }
public void userActivity(long time, boolean noChangeLights) { public void userActivity(long time, boolean noChangeLights) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER)
!= PackageManager.PERMISSION_GRANTED) {
if (shouldLog(time)) {
Slog.w(TAG, "Caller does not have DEVICE_POWER permission. pid="
+ Binder.getCallingPid() + " uid=" + Binder.getCallingUid());
}
return;
}
userActivity(time, -1, noChangeLights, OTHER_EVENT, false); userActivity(time, -1, noChangeLights, OTHER_EVENT, false);
} }