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

am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread

Browse Source 
Merge commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64' into gingerbread-plus-aosp

* commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64':
  SipService: mScreenOn is flipped to wrong value.
This commit is contained in:
Hung-ying Tyan
2010-10-12 19:46:14 -07:00
committed by Android Git Automerger
parent 9fae3eccce f1b1eec9de
commit 8a3621866d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
voip/java/com/android/server/sip/SipService.java
View File

@@ -126,9 +126,9 @@ public final class SipService extends ISipService.Stub {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
if (Intent.ACTION_SCREEN_OFF.equals(action)) { if (Intent.ACTION_SCREEN_OFF.equals(action)) {
mScreenOn = true;
} else if (Intent.ACTION_SCREEN_ON.equals(action)) {
mScreenOn = false; mScreenOn = false;
} else if (Intent.ACTION_SCREEN_ON.equals(action)) {
mScreenOn = true;
} }
} }
}; };