commit 9a7db1a6f58a3efc37c7e761445617f22adb9d4e
author Yorke Lee <yorkelee@google.com> Wed May 06 22:29:18 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 06 22:29:25 2015 +0000
tree d4e849a871da9eba54e406aaed43c385a0a5c50c
parent 2665fdfd61abce66a4843436333d5471cf389753
parent a5d5c1d0843980c5cac3b9c9541529b59b5c2434

Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev

telecomm/java/android/telecom/TelecomManager.java

diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 1431eb8..ebd3f12 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1143,8 +1143,12 @@
     public void placeCall(Uri address, Bundle extras) {
         ITelecomService service = getTelecomService();
         if (service != null) {
+            if (address == null) {
+                Log.w(TAG, "Cannot place call to empty address.");
+            }
             try {
-                service.placeCall(address, extras, mContext.getOpPackageName());
+                service.placeCall(address, extras == null ? new Bundle() : extras,
+                        mContext.getOpPackageName());
             } catch (RemoteException e) {
                 Log.e(TAG, "Error calling ITelecomService#placeCall", e);
             }