summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-07-27 16:49:10 -0700
committerAndreas Huber <andih@google.com>2010-07-27 16:49:10 -0700
commit84047bc295af663274ced27def33164d6e020b5d (patch)
tree2b9de925d070488c5205ddedef1b135bd51f98b2 /services
parent499bee34c40945f898b7561ca7792ded5b974852 (diff)
downloadframeworks_base-84047bc295af663274ced27def33164d6e020b5d.zip
frameworks_base-84047bc295af663274ced27def33164d6e020b5d.tar.gz
frameworks_base-84047bc295af663274ced27def33164d6e020b5d.tar.bz2
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Change-Id: I6d160a1851e1f73bac3775d24cf70d46da59aa47
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/PowerManagerService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index ad910c4..2fb481c 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1052,6 +1052,7 @@ class PowerManagerService extends IPowerManager.Stub
case SCREEN_DIM:
if (mDimDelay >= 0) {
when = now + mDimDelay;
+ break;
} else {
Slog.w(TAG, "mDimDelay=" + mDimDelay + " while trying to dim");
}
@@ -1060,6 +1061,9 @@ class PowerManagerService extends IPowerManager.Stub
when = now + mScreenOffDelay;
}
break;
+ default:
+ when = now;
+ break;
}
} else {
override: {