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

am b8155068: Merge change 25944 into eclair

Browse Source 
Merge commit 'b8155068ef855147d86465817be2660a5212a6bb' into eclair-plus-aosp

* commit 'b8155068ef855147d86465817be2660a5212a6bb':
  Wake the screen if the proximity wakelock is released while the proximity sensor is active.
This commit is contained in:
Mike Lockwood
2009-09-19 21:33:32 -07:00
committed by Android Git Automerger
parent c70f90b484 b8155068ef
commit c015130050
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,10 +304,7 @@ class PowerManagerService extends IPowerManager.Stub
// temporarily set mUserActivityAllowed to true so this will work // temporarily set mUserActivityAllowed to true so this will work
// even when the keyguard is on. // even when the keyguard is on.
synchronized (mLocks) { synchronized (mLocks) {
boolean savedActivityAllowed = mUserActivityAllowed; forceUserActivityLocked();
mUserActivityAllowed = true;
userActivity(SystemClock.uptimeMillis(), false);
mUserActivityAllowed = savedActivityAllowed;
} }
} }
} }
@@ -1714,6 +1711,13 @@ class PowerManagerService extends IPowerManager.Stub
} }
} }
private void forceUserActivityLocked() {
boolean savedActivityAllowed = mUserActivityAllowed;
mUserActivityAllowed = true;
userActivity(SystemClock.uptimeMillis(), false);
mUserActivityAllowed = savedActivityAllowed;
}
public void userActivityWithForce(long time, boolean noChangeLights, boolean force) { public void userActivityWithForce(long time, boolean noChangeLights, boolean force) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
userActivity(time, noChangeLights, OTHER_EVENT, force); userActivity(time, noChangeLights, OTHER_EVENT, force);
@@ -2114,7 +2118,12 @@ class PowerManagerService extends IPowerManager.Stub
Log.d(TAG, "disableProximityLockLocked"); Log.d(TAG, "disableProximityLockLocked");
} }
mSensorManager.unregisterListener(this); mSensorManager.unregisterListener(this);
mProximitySensorActive = false; synchronized (mLocks) {
if (mProximitySensorActive) {
mProximitySensorActive = false;
forceUserActivityLocked();
}
}
} }
public void onSensorChanged(SensorEvent event) { public void onSensorChanged(SensorEvent event) {
@@ -2135,10 +2144,7 @@ class PowerManagerService extends IPowerManager.Stub
Log.d(TAG, "onSensorChanged: proximity inactive, distance: " + distance); Log.d(TAG, "onSensorChanged: proximity inactive, distance: " + distance);
} }
mProximitySensorActive = false; mProximitySensorActive = false;
boolean savedActivityAllowed = mUserActivityAllowed; forceUserActivityLocked();
mUserActivityAllowed = true;
userActivity(milliseconds, false);
mUserActivityAllowed = savedActivityAllowed;
} }
} }
} }