summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-10-12 19:44:17 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-10-12 19:44:17 -0700
commitf1b1eec9de1ca27b660f6c00487de07a30eecf64 (patch)
treee26ac18445a4d897606a7909fe0f4fa82c242d3e
parentab39f1ef13a546e38b49bfc02dca2ec771c13831 (diff)
parentd6fc979edbba6c65cac1085fb5f2b8b972713758 (diff)
Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
-rw-r--r--voip/java/com/android/server/sip/SipService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/voip/java/com/android/server/sip/SipService.java b/voip/java/com/android/server/sip/SipService.java
index 6f426c9647e6..42b4e7c6e761 100644
--- a/voip/java/com/android/server/sip/SipService.java
+++ b/voip/java/com/android/server/sip/SipService.java
@@ -126,9 +126,9 @@ public final class SipService extends ISipService.Stub {
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (Intent.ACTION_SCREEN_OFF.equals(action)) {
- mScreenOn = true;
- } else if (Intent.ACTION_SCREEN_ON.equals(action)) {
mScreenOn = false;
+ } else if (Intent.ACTION_SCREEN_ON.equals(action)) {
+ mScreenOn = true;
}
}
};