Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8396c5c authored by Yanting Yang's avatar Yanting Yang
Browse files

RESTRICT AUTOMERGE 

Fix NPE of launching Settings with malicious URL

Add SafetyNet logging for tracing.

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

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

+9 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

}