commit f0046911cfce79f17e1c7853690fedb48e65d751
author Yorke Lee <yorkelee@google.com> Thu Feb 26 17:45:33 2015 -0800
committer Yorke Lee <yorkelee@google.com> Wed Mar 11 17:23:58 2015 -0700
tree 3f9fc113d64b5edb144a3567143d9116e410d766
parent 47da905183b4e2ec50eb16c75852d68b558c7c1e

DO NOT MERGE Fix NPE in Telecom

Use empty bundle instead of Bundle.EMPTY which is non mutable.

Bug: 19486064
Change-Id: Ia015a695c4e7849cb37b66c2ac73d8b1f58ac344

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]",