PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RESTRICT AUTOMERGE

Browse Source 
Fix NPE of launching Settings with malicious URL

Add SafetyNet logging for tracing.

Fixes: 122836081
Test: visual, robotests
Change-Id: I97430ea0208c570c46a02dd499dfd944d20eb06e
This commit is contained in:
Yanting Yang
2019-07-25 20:56:22 +08:00
parent d41b716f6c
commit f8396c5cc0
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
View File

@@ -19,6 +19,8 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.bluetooth.BluetoothSliceBuilder;
@@ -71,6 +73,12 @@ public class SliceDeepLinkSpringBoard extends Activity {
} }
private static Uri parse(Uri uri) { 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);
}
} }
} }