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

am: d80e82f917

Change-Id: Icb9dd84d761f15b230c44ab55ac050750978cc8d
This commit is contained in:
Abodunrinwa Toki
2017-05-24 02:06:13 +00:00
committed by android-build-merger

View File

@@ -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.