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

Commit 4d0cf17e authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by android-build-merger
Browse files

Merge "Make TextClassifier.getLinks(...) a default method." into oc-dev 

am: d80e82f9

Change-Id: Icb9dd84d761f15b230c44ab55ac050750978cc8d
parents 177b7390 d80e82f9

core/java/android/view/textclassifier/TextClassifier.java

+4 −7
Original line number Diff line number Diff line
@@ -67,11 +67,6 @@ public interface TextClassifier { 
                CharSequence text, int startIndex, int endIndex, LocaleList defaultLocales) {

            return TextClassification.EMPTY;

        }



        @Override

        public LinksInfo getLinks(CharSequence text, int linkMask, LocaleList defaultLocales) {

            return LinksInfo.NO_OP;

        }

    };



    /**
@@ -138,8 +133,10 @@ public interface TextClassifier { 
     * @hide

     */

    @WorkerThread

    LinksInfo getLinks(

            @NonNull CharSequence text, int linkMask, @Nullable LocaleList defaultLocales);

    default LinksInfo getLinks(

            @NonNull CharSequence text, int linkMask, @Nullable LocaleList defaultLocales) {

        return LinksInfo.NO_OP;

    }



    /**

     * Logs a TextClassifier event.