commit 12bc9c3125d165057bbdc5facf3b80038bb41707
author Yorke Lee <yorkelee@google.com> Mon Mar 23 18:43:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 23 18:43:31 2015 +0000
tree 40baeb3713028caee3083052fdb86cf836276a75
parent 6a9e6485f2503c21140eb3ff79715aa88c6b6aee
parent a49ede1c4fb4486c51c218384299ad686ba2650a

Merge "Fix NPE in CallIntentProcessor"

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 3c3b98f..e0e16a3 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,