commit c4b87477c076d61062950becc132b7483e3fb198
author Hung-ying Tyan <tyanh@google.com> Sun Sep 19 18:23:44 2010 +0800
committer Hung-ying Tyan <tyanh@google.com> Mon Sep 20 08:03:20 2010 +0800
tree 6156a33ef82110be8bd9e75bf47345b897d5e70c
parent 1d1583573d2099756bbbeef48d97c280edc393e0

SIP: add config flag for wifi-only configuration.

http://b/issue?id=2994029

Change-Id: I328da9b0f8b70d660dbcefffdac8250341792101

core/res/res/values/config.xml

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index d565c68..720dc97 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -342,4 +342,6 @@
     <!-- 2 means give warning -->
     <integer name="config_datause_notification_type">2</integer>
 
+    <!-- Enables SIP on WIFI only -->
+    <bool name="config_sip_wifi_only">false</bool>
 </resources>

services/java/com/android/server/sip/SipService.java

diff --git a/services/java/com/android/server/sip/SipService.java b/services/java/com/android/server/sip/SipService.java
index d7747fb..7e13d65 100644
--- a/services/java/com/android/server/sip/SipService.java
+++ b/services/java/com/android/server/sip/SipService.java
@@ -71,6 +71,7 @@
     private boolean mConnected;
     private WakeupTimer mTimer;
     private WifiManager.WifiLock mWifiLock;
+    private boolean mWifiOnly;
 
     // SipProfile URI --> group
     private Map<String, SipSessionGroupExt> mSipGroups =
@@ -99,6 +100,7 @@
                 new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
 
         mTimer = new WakeupTimer(context);
+        mWifiOnly = SipManager.isSipWifiOnly(context);
     }
 
     public synchronized SipProfile[] getListOfProfiles() {
@@ -774,6 +776,15 @@
                     String type = netInfo.getTypeName();
                     NetworkInfo.State state = netInfo.getState();
 
+                    if (mWifiOnly && (netInfo.getType() !=
+                            ConnectivityManager.TYPE_WIFI)) {
+                        if (DEBUG) {
+                            Log.d(TAG, "Wifi only, other connectivity ignored: "
+                                    + type);
+                        }
+                        return;
+                    }
+
                     NetworkInfo activeNetInfo = getActiveNetworkInfo();
                     if (DEBUG) {
                         if (activeNetInfo != null) {

voip/java/android/net/sip/SipManager.java

diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java
index 36895cd..9ee6f34 100644
--- a/voip/java/android/net/sip/SipManager.java
+++ b/voip/java/android/net/sip/SipManager.java
@@ -97,6 +97,14 @@
          */
     }
 
+    /**
+     * Returns true if SIP is only available on WIFI.
+     */
+    public static boolean isSipWifiOnly(Context context) {
+        return context.getResources().getBoolean(
+                com.android.internal.R.bool.config_sip_wifi_only);
+    }
+
     private SipManager() {
         createSipService();
     }