diff options
| author | repo sync <chiachi@android.com> | 2010-09-02 09:26:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-02 09:26:24 -0700 |
| commit | eaa511fd03e01bdae2bc09e2f29b51f76f64e0d7 (patch) | |
| tree | c3e8d2e95c9b567b224a3828c2247992fb34b82c /services/java/com/android/server/sip/SipService.java | |
| parent | 0525f95bb11765e074d4f67b90bd0fc6aa34d6b3 (diff) | |
| parent | 3d67c5688f4855acbfd6de103b278ceee74a4451 (diff) | |
Merge "resolved conflicts for merge of 12eaf9d5 to master"
Diffstat (limited to 'services/java/com/android/server/sip/SipService.java')
| -rw-r--r-- | services/java/com/android/server/sip/SipService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/java/com/android/server/sip/SipService.java b/services/java/com/android/server/sip/SipService.java index 626b488fa6c1..563ce58e36c4 100644 --- a/services/java/com/android/server/sip/SipService.java +++ b/services/java/com/android/server/sip/SipService.java @@ -53,6 +53,9 @@ import java.util.TimerTask; import java.util.TreeSet; import javax.sip.SipException; +/** + * @hide + */ public final class SipService extends ISipService.Stub { private static final String TAG = "SipService"; private static final int EXPIRY_TIME = 3600; @@ -442,7 +445,7 @@ public final class SipService extends ISipService.Stub { @Override public void onRinging(ISipSession session, SipProfile caller, - byte[] sessionDescription) { + String sessionDescription) { synchronized (SipService.this) { try { if (!isRegistered()) { |