diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-03-23 11:15:35 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2015-03-23 11:15:35 -0700 |
| commit | a49ede1c4fb4486c51c218384299ad686ba2650a (patch) | |
| tree | 7a8a78d042d7c7c36e0962a2468536f2c601064e /src/com/android/server/telecom/CallIntentProcessor.java | |
| parent | 3d4bafb60a202ab6a6c99a48b493d83a3229642e (diff) | |
| download | android_packages_services_Telecomm-a49ede1c4fb4486c51c218384299ad686ba2650a.tar.gz android_packages_services_Telecomm-a49ede1c4fb4486c51c218384299ad686ba2650a.tar.bz2 android_packages_services_Telecomm-a49ede1c4fb4486c51c218384299ad686ba2650a.zip | |
Fix NPE in CallIntentProcessor
Fix was submitted to LMP MR1 but was lost in a series of merges to
master
Bug: 19888713
Change-Id: Iea83b55bad5bdbb4e15dccf26667cea0f4fdd7aa
Diffstat (limited to 'src/com/android/server/telecom/CallIntentProcessor.java')
| -rw-r--r-- | src/com/android/server/telecom/CallIntentProcessor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/server/telecom/CallIntentProcessor.java b/src/com/android/server/telecom/CallIntentProcessor.java index 3c3b98f9..e0e16a3c 100644 --- a/src/com/android/server/telecom/CallIntentProcessor.java +++ b/src/com/android/server/telecom/CallIntentProcessor.java @@ -80,7 +80,7 @@ public class CallIntentProcessor { 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 @@ public class CallIntentProcessor { clientExtras = intent.getBundleExtra(TelecomManager.EXTRA_INCOMING_CALL_EXTRAS); } if (clientExtras == null) { - clientExtras = Bundle.EMPTY; + clientExtras = new Bundle(); } Log.d(CallIntentProcessor.class, |