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

Merge "Fix build."

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-09-17 03:24:53 -07:00
committed by Android (Google) Code Review
parent 6aec9f4766 e30fc66305
commit 9e2f4096cd
1 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
voip/java/android/net/sip/SipAudioCallImpl.java
View File

@@ -78,8 +78,6 @@ public class SipAudioCallImpl extends SipSessionAdapter
private ToneGenerator mRingbackTone;
private SipProfile mPendingCallRequest;
private WifiManager mWm;
private WifiManager.WifiLock mWifiHighPerfLock;
private SipErrorCode mErrorCode;
private String mErrorMessage;
@@ -87,7 +85,6 @@ public class SipAudioCallImpl extends SipSessionAdapter
public SipAudioCallImpl(Context context, SipProfile localProfile) {
mContext = context;
mLocalProfile = localProfile;
mWm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
}
public void setListener(SipAudioCall.Listener listener) {
@@ -450,28 +447,6 @@ public class SipAudioCallImpl extends SipSessionAdapter
}
}
private void grabWifiHighPerfLock() {
if (mWifiHighPerfLock == null) {
Log.v(TAG, "acquire wifi high perf lock");
mWifiHighPerfLock = ((WifiManager)
mContext.getSystemService(Context.WIFI_SERVICE))
.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TAG);
mWifiHighPerfLock.acquire();
}
}
private void releaseWifiHighPerfLock() {
if (mWifiHighPerfLock != null) {
Log.v(TAG, "release wifi high perf lock");
mWifiHighPerfLock.release();
mWifiHighPerfLock = null;
}
}
private boolean isWifiOn() {
return (mWm.getConnectionInfo().getBSSID() == null) ? false : true;
}
private String createContinueSessionDescription() {
return createSdpBuilder(true, mCodec).build();
}
@@ -620,7 +595,6 @@ public class SipAudioCallImpl extends SipSessionAdapter
stopCall(DONT_RELEASE_SOCKET);
mInCall = true;
SdpSessionDescription peerSd = mPeerSd;
if (isWifiOn()) grabWifiHighPerfLock();
String peerMediaAddress = peerSd.getPeerMediaAddress(AUDIO);
// TODO: handle multiple media fields
int peerMediaPort = peerSd.getPeerMediaPort(AUDIO);
@@ -683,7 +657,6 @@ public class SipAudioCallImpl extends SipSessionAdapter
private void stopCall(boolean releaseSocket) {
Log.d(TAG, "stop audiocall");
releaseWifiHighPerfLock();
if (mAudioStream != null) {
mAudioStream.join(null);