summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-27 21:09:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 21:09:56 -0700
commit159cceaae22076b743626ddde84c501b3f491f6e (patch)
treede9f41fb7f6fce915218d84abd94ed6f2aa3a95c /telephony/java
parent26d5786fb1a43d82b40fa908e1220a018b748c93 (diff)
parent368d796e2e28ecd738362c7a4566cb3eb219ab26 (diff)
downloadframeworks_base-159cceaae22076b743626ddde84c501b3f491f6e.zip
frameworks_base-159cceaae22076b743626ddde84c501b3f491f6e.tar.gz
frameworks_base-159cceaae22076b743626ddde84c501b3f491f6e.tar.bz2
am 368d796e: Fix build.
Merge commit '368d796e2e28ecd738362c7a4566cb3eb219ab26' into gingerbread-plus-aosp * commit '368d796e2e28ecd738362c7a4566cb3eb219ab26': Fix build.
Diffstat (limited to 'telephony/java')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/sip/SipPhone.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index 9670214..3f4fdda 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -441,7 +441,7 @@ public class SipPhone extends SipPhoneBase {
@Override
public void hangup() throws CallStateException {
synchronized (SipPhone.class) {
- if (mState.isAlive()) {
+ if (state.isAlive()) {
Log.d(LOG_TAG, "hang up call: " + getState() + ": " + this
+ " on phone " + getPhone());
CallStateException excp = null;