From ed91c3a159e7bb0775c86d8848849eec9723ed44 Mon Sep 17 00:00:00 2001
From: sung_jae <sung_jae.kim@samsung.com>
Date: Tue, 13 Aug 2019 16:43:27 +0900
Subject: Fix NPE

Add checking of NPE in getNumberFromIntent API of PhoneNumberUtils.

Test: atest CtsTelephonyTestCases

Change-Id: I507ee020a98a919edc35e6402c0b8f9f84898870
Signed-off-by: sung_jae <sung_jae.kim@samsung.com>
---
 telephony/java/android/telephony/PhoneNumberUtils.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index f03a9dc0f963..af3ba5e44158 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -217,6 +217,9 @@ public class PhoneNumberUtils {
         }
 
         String scheme = uri.getScheme();
+        if (scheme == null) {
+            return null;
+        }
 
         if (scheme.equals("tel") || scheme.equals("sip")) {
             return uri.getSchemeSpecificPart();
-- 
cgit v1.2.3-59-g8ed1b