Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev (9a7db1a6) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -1143,8 +1143,12 @@ public class TelecomManager {
		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);
		}