commit f8396c5cc0293d7231a3e73dc9b09718d25b65ed
author Yanting Yang <yantingyang@google.com> Thu Jul 25 20:56:22 2019 +0800
committer Yanting Yang <yantingyang@google.com> Tue Feb 11 16:17:08 2020 +0800
tree 7d7daa0433d7e20e16c583cda66aeceaf3a5242d
parent d41b716f6c686e9dcdc94c38b9b13cd9c93f76aa

RESTRICT AUTOMERGE
Fix NPE of launching Settings with malicious URL

Add SafetyNet logging for tracing.

Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e

src/com/android/settings/slices/SliceDeepLinkSpringBoard.java

diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
index 2ff071e..88263e8 100644
--- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
+++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
@@ -19,6 +19,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.EventLog;
 import android.util.Log;
 
 import com.android.settings.bluetooth.BluetoothSliceBuilder;
@@ -71,6 +73,12 @@
     }
 
     private static Uri parse(Uri uri) {
-        return Uri.parse(uri.getQueryParameter(EXTRA_SLICE));
+        final String sliceParameter = uri.getQueryParameter(EXTRA_SLICE);
+        if (TextUtils.isEmpty(sliceParameter)) {
+            EventLog.writeEvent(0x534e4554, "122836081", -1, "");
+            return null;
+        } else {
+            return Uri.parse(sliceParameter);
+        }
     }
 }