commit e70f32b1ce411ad24e6dc97b7effe8951b5648ce
author Yorke Lee <yorkelee@google.com> Thu Mar 12 00:45:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 12 00:45:58 2015 +0000
tree 3c5f8efc876131419ae7535b99fd7294bed74403
parent e566b575d5edbd2dd73104579f8d906943713cda
parent cd5cbe96cd8a0a9ac9b1dfe2a2330bacf5ef8fd8

am cd5cbe96: 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 27d4f51..bdae582 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 = Bundle.EMPTY;
+            clientExtras = new Bundle();
         }
 
         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 = Bundle.EMPTY;
+            clientExtras = new Bundle();
         }
 
         Log.d(TAG, "Processing incoming call from connection service [%s]",