From a299fc5435799f73bbd5ae7a81694e58098cd2a7 Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Thu, 25 Jul 2019 20:56:22 +0800
Subject: [PATCH] Fix NPE of launching Settings with malicious URL

Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e
---
 src/com/android/settings/slices/SliceDeepLinkSpringBoard.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
index 2ff071eebc0..cf8688a983a 100644
--- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
+++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
@@ -19,6 +19,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.bluetooth.BluetoothSliceBuilder;
@@ -71,6 +72,7 @@ public class SliceDeepLinkSpringBoard extends Activity {
     }
 
     private static Uri parse(Uri uri) {
-        return Uri.parse(uri.getQueryParameter(EXTRA_SLICE));
+        final String sliceParameter = uri.getQueryParameter(EXTRA_SLICE);
+        return TextUtils.isEmpty(sliceParameter) ? null : Uri.parse(sliceParameter);
     }
 }