commit ff6e254821785f0b3e97be6351322a06f4ece916
author Yorke Lee <yorkelee@google.com> Thu Mar 12 00:46:17 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 12 00:46:17 2015 +0000
tree 87ca750586164a352b730ced2ce00e2af028ac21
parent 348dcd9ddb95bee674ceb7dc37f7369ca5970908
parent cd5cbe96cd8a0a9ac9b1dfe2a2330bacf5ef8fd8

am cd5cbe96: (-s ours) Merge "DO NOT MERGE Fix NPE in Telecom" into lmp-mr1-dev

* commit 'cd5cbe96cd8a0a9ac9b1dfe2a2330bacf5ef8fd8':
  DO NOT MERGE Fix NPE in Telecom

src/com/android/server/telecom/CallReceiver.java

diff --git a/src/com/android/server/telecom/CallReceiver.java b/src/com/android/server/telecom/CallReceiver.java
index bdae582..27d4f51 100644
--- a/src/com/android/server/telecom/CallReceiver.java
+++ b/src/com/android/server/telecom/CallReceiver.java
@@ -70,7 +70,7 @@
             clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS);
         }
         if (clientExtras == null) {
-            clientExtras = new Bundle();
+            clientExtras = Bundle.EMPTY;
         }
 
         final boolean isDefaultDialer = intent.getBooleanExtra(KEY_IS_DEFAULT_DIALER, false);
@@ -113,7 +113,7 @@
             clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS);
         }
         if (clientExtras == null) {
-            clientExtras = new Bundle();
+            clientExtras = Bundle.EMPTY;
         }
 
         Log.d(TAG, "Processing incoming call from connection service [%s]",

src/com/android/server/telecom/InCallController.java

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index eef75e3..a5da3a3 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -586,8 +586,8 @@
         Connection.CAPABILITY_HIGH_DEF_AUDIO,
         android.telecom.Call.Details.CAPABILITY_HIGH_DEF_AUDIO,
 
-        Connection.CAPABILITY_VoWIFI,
-        android.telecom.Call.Details.CAPABILITY_VoWIFI,
+        Connection.CAPABILITY_WIFI,
+        android.telecom.Call.Details.CAPABILITY_WIFI,
 
         Connection.CAPABILITY_SEPARATE_FROM_CONFERENCE,
         android.telecom.Call.Details.CAPABILITY_SEPARATE_FROM_CONFERENCE,