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

Commit ee147725 authored by Yoshiki Iguchi's avatar Yoshiki Iguchi
Browse files

TextView.extractText should not crash with null arguments 

TextView.extractText crashes when null argument(s) is given. This patch
adds a null-check and prevents the crash.

Bug: 5762732

Change-Id: I945b6cde77f30cb5ee2944797732ec69890711bf
parent 8cc578c3

core/java/android/widget/Editor.java

+65 −59
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.widget;



import android.R;

import android.annotation.Nullable;

import android.app.PendingIntent;

import android.app.PendingIntent.CanceledException;

import android.content.ClipData;
@@ -1281,11 +1282,18 @@ public class Editor { 
                EXTRACT_UNKNOWN, outText);

    }



    private boolean extractTextInternal(ExtractedTextRequest request,

    private boolean extractTextInternal(@Nullable ExtractedTextRequest request,

            int partialStartOffset, int partialEndOffset, int delta,

            ExtractedText outText) {

            @Nullable ExtractedText outText) {

        if (request == null || outText == null) {

            return false;

        }



        final CharSequence content = mTextView.getText();

        if (content != null) {

        if (content == null) {

            return false;

        }



        if (partialStartOffset != EXTRACT_NOTHING) {

            final int N = content.length();

            if (partialStartOffset < 0) {
@@ -1348,8 +1356,6 @@ public class Editor { 
        outText.selectionEnd = mTextView.getSelectionEnd();

        return true;

    }

        return false;

    }



    boolean reportExtractedText() {

        final Editor.InputMethodState ims = mInputMethodState;