commit 245faa7d42b2ae23ed0e8b500498f6dfaa5a7e7f
author Yorke Lee <yorkelee@google.com> Mon Mar 23 12:21:13 2015 -0700
committer Yorke Lee <yorkelee@google.com> Mon Mar 23 12:21:44 2015 -0700
tree 969877f751e640f783f55283f89a373ce4bd5476
parent a247fedc24f2bd087cad83d79dbcfabdbe9e471b

DO NOT MERGE Fix potential NPE in Telecom

Bundle.EMPTY is immutable, use new Bundle() instead.

Change-Id: Ie1a452083d235fa3732e22fc0ea89d6fcc00c923

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

diff --git a/src/com/android/server/telecom/CallIntentProcessor.java b/src/com/android/server/telecom/CallIntentProcessor.java
index 1a82498..7ec83cb 100644
--- a/src/com/android/server/telecom/CallIntentProcessor.java
+++ b/src/com/android/server/telecom/CallIntentProcessor.java
@@ -80,7 +80,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);
@@ -125,7 +125,7 @@
             clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS);
         }
         if (clientExtras == null) {
-            clientExtras = Bundle.EMPTY;
+            clientExtras = new Bundle();
         }
 
         Log.d(CallIntentProcessor.class,