commit b6d4723aab797d0f95b12f40853fa2405c4cb481
author Chung-yih Wang <cywang@google.com> Thu Aug 26 16:36:01 2010 +0800
committer Chung-yih Wang <cywang@google.com> Thu Aug 26 16:37:10 2010 +0800
tree cc65e71f2625e93876bd83dc2459b1dcd2d0cc74
parent c54f65e61d8173bfa1d93810fcd64b76889e11e9

Revert "Add Wifi High Perf. mode during a call."

This reverts commit 0858806ffcb9ff34725abb79106aa1de27d1bf60.

Change-Id: I0432ac7af6e0becf196728190b71dfe82ce63cd0

voip/java/android/net/sip/SipAudioCallImpl.java

diff --git a/voip/java/android/net/sip/SipAudioCallImpl.java b/voip/java/android/net/sip/SipAudioCallImpl.java
index 5789cd4..b8ac6d7 100644
--- a/voip/java/android/net/sip/SipAudioCallImpl.java
+++ b/voip/java/android/net/sip/SipAudioCallImpl.java
@@ -36,7 +36,6 @@
 import android.net.sip.SipProfile;
 import android.net.sip.SipSessionAdapter;
 import android.net.sip.SipSessionState;
-import android.net.wifi.WifiManager;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.Vibrator;
@@ -85,13 +84,10 @@
     private ToneGenerator mRingbackTone;
 
     private SipProfile mPendingCallRequest;
-    private WifiManager mWm;
-    private WifiManager.WifiLock mWifiHighPerfLock;
 
     public SipAudioCallImpl(Context context, SipProfile localProfile) {
         mContext = context;
         mLocalProfile = localProfile;
-        mWm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
     }
 
     public void setListener(SipAudioCall.Listener listener) {
@@ -426,28 +422,6 @@
         }
     }
 
-    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 SessionDescription createContinueSessionDescription() {
         return createSdpBuilder(true, mCodec).build();
     }
@@ -582,7 +556,7 @@
 
     private void startCall(SdpSessionDescription peerSd) {
         stopCall(DONT_RELEASE_SOCKET);
-        if (isWifiOn()) grabWifiHighPerfLock();
+
         mPeerSd = peerSd;
         String peerMediaAddress = peerSd.getPeerMediaAddress(AUDIO);
         // TODO: handle multiple media fields
@@ -649,7 +623,6 @@
 
     private void stopCall(boolean releaseSocket) {
         Log.d(TAG, "stop audiocall");
-        releaseWifiHighPerfLock();
         if (mAudioStream != null) {
             mAudioStream.join(null);