From 2227067d99af771e86ce507e952fd5ff5d429a89 Mon Sep 17 00:00:00 2001 From: Magnus Karlsson Date: Wed, 6 Feb 2013 11:49:24 +0100 Subject: Fixing crash in PhoneNumberUtils getNumberFromIntent Handling intent with no data when trying to retrieve number from intent. Change-Id: If7c5930e7048aec732fb7a3fbeb3391e1408b071 --- telephony/java/android/telephony/PhoneNumberUtils.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 8b85d8ca7d88..3ae210636f84 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -152,6 +152,11 @@ public class PhoneNumberUtils String number = null; Uri uri = intent.getData(); + + if (uri == null) { + return null; + } + String scheme = uri.getScheme(); if (scheme.equals("tel") || scheme.equals("sip")) { -- cgit v1.2.3-59-g8ed1b