--- a/services/java/com/android/server/power/PowerManagerService.java
+++ b/services/java/com/android/server/power/PowerManagerService.java
@@ -1365,6 +1365,7 @@ public final class PowerManagerService extends IPowerManager.Stub
}
private int getScreenOffTimeoutLocked() {
+ int DonotSleeptimeout;
int timeout = mScreenOffTimeoutSetting;
if (isMaximumScreenOffTimeoutFromDeviceAdminEnforcedLocked()) {
timeout = Math.min(timeout, mMaximumScreenOffTimeoutFromDeviceAdmin);
@@ -1372,6 +1373,12 @@ public final class PowerManagerService extends IPowerManager.Stub
if (mUserActivityTimeoutOverrideFromWindowManager >= 0) {
timeout = (int)Math.min(timeout, mUserActivityTimeoutOverrideFromWindowManager);
}
+ DonotSleeptimeout = mScreenOffTimeoutSetting;
+ if(DonotSleeptimeout < 0)
+ {
+ DonotSleeptimeout = mMaximumScreenOffTimeoutFromDeviceAdmin ;
+ return Math.max(DonotSleeptimeout, mMaximumScreenOffTimeoutFromDeviceAdmin);
+ }
return Math.max(timeout, MINIMUM_SCREEN_OFF_TIMEOUT);
}
+++ b/services/java/com/android/server/power/PowerManagerService.java
@@ -1365,6 +1365,7 @@ public final class PowerManagerService extends IPowerManager.Stub
}
private int getScreenOffTimeoutLocked() {
+ int DonotSleeptimeout;
int timeout = mScreenOffTimeoutSetting;
if (isMaximumScreenOffTimeoutFromDeviceAdminEnforcedLocked()) {
timeout = Math.min(timeout, mMaximumScreenOffTimeoutFromDeviceAdmin);
@@ -1372,6 +1373,12 @@ public final class PowerManagerService extends IPowerManager.Stub
if (mUserActivityTimeoutOverrideFromWindowManager >= 0) {
timeout = (int)Math.min(timeout, mUserActivityTimeoutOverrideFromWindowManager);
}
+ DonotSleeptimeout = mScreenOffTimeoutSetting;
+ if(DonotSleeptimeout < 0)
+ {
+ DonotSleeptimeout = mMaximumScreenOffTimeoutFromDeviceAdmin ;
+ return Math.max(DonotSleeptimeout, mMaximumScreenOffTimeoutFromDeviceAdmin);
+ }
return Math.max(timeout, MINIMUM_SCREEN_OFF_TIMEOUT);
}
以前在网上找了很多不休眠不锁屏的方法,那写修改可能对android4.0很有用,android4.2上还得要修改下才行。