From f8396c5cc0293d7231a3e73dc9b09718d25b65ed Mon Sep 17 00:00:00 2001 From: Yanting Yang Date: Thu, 25 Jul 2019 20:56:22 +0800 Subject: [PATCH] RESTRICT AUTOMERGE Fix NPE of launching Settings with malicious URL Add SafetyNet logging for tracing. Fixes: 122836081 Test: visual, robotests Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e --- .../settings/slices/SliceDeepLinkSpringBoard.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java index 2ff071eebc0..88263e84253 100644 --- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java +++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java @@ -19,6 +19,8 @@ import android.content.Intent; 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 @@ 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); + if (TextUtils.isEmpty(sliceParameter)) { + EventLog.writeEvent(0x534e4554, "122836081", -1, ""); + return null; + } else { + return Uri.parse(sliceParameter); + } } }