resolved conflicts for merge of 0be676b7 to master

Change-Id: Ica8afe1eb165d69042b356fbf9833efb5c6dbb24

2 files changed, 18 insertions, 4 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 5f9c45204..9f14e265d 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -235,7 +235,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
     @Override
     public void setCallState(int state, int cause, boolean bluetoothOn,
-            String gatewayLabel, String gatewayNumber) {
+            String gatewayLabel, String gatewayNumber, String wifiConnection) {
         String callStateLabel = null;
 
         if (Call.State.isDialing(state) && !TextUtils.isEmpty(gatewayLabel)) {
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 33d99b7d6..25520e4ea 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -22,6 +22,8 @@ import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.graphics.Bitmap;
 import android.telephony.DisconnectCause;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
@@ -190,7 +192,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
             final boolean bluetoothOn =
                     (AudioModeProvider.getInstance().getAudioMode() == AudioMode.BLUETOOTH);
             ui.setCallState(mPrimary.getState(), mPrimary.getDisconnectCause(), bluetoothOn,
-                    getGatewayLabel(), getGatewayNumber());
+                    getGatewayLabel(), getGatewayNumber(), getWifiConnection());
         } else {
             ui.setCallState(Call.State.IDLE, DisconnectCause.NOT_VALID, false, null, null);
         }
@@ -206,10 +208,22 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
             final boolean bluetoothOn = (AudioMode.BLUETOOTH == mode);
 
             getUi().setCallState(mPrimary.getState(), mPrimary.getDisconnectCause(), bluetoothOn,
-                    getGatewayLabel(), getGatewayNumber());
+                    getGatewayLabel(), getGatewayNumber(), getWifiConnection());
         }
     }
 
+    private String getWifiConnection() {
+        if (mPrimary.isWifiCall()) {
+            final WifiManager wifiManager = (WifiManager) mContext.getSystemService(
+                    Context.WIFI_SERVICE);
+            final WifiInfo info = wifiManager.getConnectionInfo();
+            if (info != null) {
+                return info.getSSID();
+            }
+        }
+        return null;
+    }
+
     @Override
     public void onSupportedAudioMode(int mask) {
     }
@@ -476,7 +490,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
                 Drawable photo, boolean isConference, boolean isGeneric);
         void setSecondaryImage(Drawable image);
         void setCallState(int state, int cause, boolean bluetoothOn,
-                String gatewayLabel, String gatewayNumber);
+                String gatewayLabel, String gatewayNumber, String wifiConnection);
         void setPrimaryCallElapsedTime(boolean show, String duration);
         void setPrimaryName(String name, boolean nameIsNumber);
         void setPrimaryImage(Drawable image);