diff options
| author | Ravindra <c_rthat@codeaurora.org> | 2016-01-22 10:54:12 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-01 01:12:30 -0700 |
| commit | 50c58604dc9b6aed638d510f378f756da8f8b803 (patch) | |
| tree | b877aae1216b5022b0b3164b04786bb38af1a3c3 | |
| parent | a5ee9a7dd0aa70139ed0e7252f254e7a374151cb (diff) | |
| download | android_packages_services_Telecomm-50c58604dc9b6aed638d510f378f756da8f8b803.tar.gz android_packages_services_Telecomm-50c58604dc9b6aed638d510f378f756da8f8b803.tar.bz2 android_packages_services_Telecomm-50c58604dc9b6aed638d510f378f756da8f8b803.zip | |
Fix to prevent NPE
While propagating merge failure to InCallUI check for call extras
to be empty.
Change-Id: I5192eb84fb67b369dd3b48f95ccb7571493574e5
CRs-Fixed: 964586
| -rw-r--r-- | src/com/android/server/telecom/ConnectionServiceWrapper.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java index 55eba5d2..ad606c73 100644 --- a/src/com/android/server/telecom/ConnectionServiceWrapper.java +++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java @@ -361,8 +361,10 @@ final class ConnectionServiceWrapper extends ServiceBinder { // it here. That way we can also handle the UI of notifying that // the merged has failed. Bundle extras = call.getExtras(); - extras.putInt("MergeFail", new java.util.Random().nextInt()); - call.setExtras(extras); + if (extras != null) { + extras.putInt("MergeFail", new java.util.Random().nextInt()); + call.setExtras(extras); + } mCallsManager.onMergeFailed(call); } else { Log.w(this, "setConferenceMergeFailed, unknown call id: %s", callId); |