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

am 8061f64f: Merge change Ib0d3d9d0 into eclair

Browse Source 
Merge commit '8061f64f6246116381131fc7951b6d88be37161a' into eclair-mr2

* commit '8061f64f6246116381131fc7951b6d88be37161a':
  PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
This commit is contained in:
Mike Lockwood
2009-10-28 11:40:47 -07:00
committed by Android Git Automerger
parent 4c071f0d69 8061f64f62
commit 7c64d4486a
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2273,15 +2273,27 @@ class PowerManagerService extends IPowerManager.Stub
if (mSpew) { if (mSpew) {
Log.d(TAG, "enableProximityLockLocked"); Log.d(TAG, "enableProximityLockLocked");
} }
mSensorManager.registerListener(mProximityListener, mProximitySensor, // clear calling identity so sensor manager battery stats are accurate
SensorManager.SENSOR_DELAY_NORMAL); long identity = Binder.clearCallingIdentity();
try {
mSensorManager.registerListener(mProximityListener, mProximitySensor,
SensorManager.SENSOR_DELAY_NORMAL);
} finally {
Binder.restoreCallingIdentity(identity);
}
} }
private void disableProximityLockLocked() { private void disableProximityLockLocked() {
if (mSpew) { if (mSpew) {
Log.d(TAG, "disableProximityLockLocked"); Log.d(TAG, "disableProximityLockLocked");
} }
mSensorManager.unregisterListener(mProximityListener); // clear calling identity so sensor manager battery stats are accurate
long identity = Binder.clearCallingIdentity();
try {
mSensorManager.unregisterListener(mProximityListener);
} finally {
Binder.restoreCallingIdentity(identity);
}
synchronized (mLocks) { synchronized (mLocks) {
if (mProximitySensorActive) { if (mProximitySensorActive) {
mProximitySensorActive = false; mProximitySensorActive = false;
@@ -2296,12 +2308,18 @@ class PowerManagerService extends IPowerManager.Stub
} }
if (mSensorManager != null && mLightSensorEnabled != enable) { if (mSensorManager != null && mLightSensorEnabled != enable) {
mLightSensorEnabled = enable; mLightSensorEnabled = enable;
if (enable) { // clear calling identity so sensor manager battery stats are accurate
mSensorManager.registerListener(mLightListener, mLightSensor, long identity = Binder.clearCallingIdentity();
SensorManager.SENSOR_DELAY_NORMAL); try {
} else { if (enable) {
mSensorManager.unregisterListener(mLightListener); mSensorManager.registerListener(mLightListener, mLightSensor,
mHandler.removeCallbacks(mAutoBrightnessTask); SensorManager.SENSOR_DELAY_NORMAL);
} else {
mSensorManager.unregisterListener(mLightListener);
mHandler.removeCallbacks(mAutoBrightnessTask);
}
} finally {
Binder.restoreCallingIdentity(identity);
} }
} }
} }