diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-14 21:19:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 21:19:54 -0700 |
| commit | 4fe18a4998ad1d3d0a62a6b35f9225304c34ef00 (patch) | |
| tree | 24319683f246c43300aa32f54f99ea214d614a3b /voip/java | |
| parent | 734b8b8cb8b083c62870d63903eb478c3ebe259f (diff) | |
| parent | 8a3621866d8a04b0a229eb5765ea9799e68fd90c (diff) | |
| download | frameworks_base-4fe18a4998ad1d3d0a62a6b35f9225304c34ef00.zip frameworks_base-4fe18a4998ad1d3d0a62a6b35f9225304c34ef00.tar.gz frameworks_base-4fe18a4998ad1d3d0a62a6b35f9225304c34ef00.tar.bz2 | |
am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
Merge commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c'
* commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c':
SipService: mScreenOn is flipped to wrong value.
Diffstat (limited to 'voip/java')
| -rw-r--r-- | voip/java/com/android/server/sip/SipService.java | 4 |
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 6f426c9..42b4e7c 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; } } }; |