Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check for Nullable argument." into pi-dev

Browse Source
This commit is contained in:
Richard Ledley
2018-04-05 18:45:45 +00:00
committed by Android (Google) Code Review
parent fa5134e960 5f77b6a35a
commit 335b0d36da
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
core/java/android/view/textclassifier/TextClassifier.java
View File

@@ -216,13 +216,17 @@ public interface TextClassifier {
@IntRange(from = 0) int selectionStartIndex,
@IntRange(from = 0) int selectionEndIndex,
@Nullable TextSelection.Options options) {
final TextSelection.Request request = options.getRequest() != null
? options.getRequest()
: new TextSelection.Request.Builder(
text, selectionStartIndex, selectionEndIndex)
.setDefaultLocales(options.getDefaultLocales())
.build();
return suggestSelection(request);
if (options == null) {
return suggestSelection(new TextSelection.Request.Builder(
text, selectionStartIndex, selectionEndIndex).build());
} else if (options.getRequest() != null) {
return suggestSelection(options.getRequest());
} else {
return suggestSelection(
new TextSelection.Request.Builder(text, selectionStartIndex, selectionEndIndex)
.setDefaultLocales(options.getDefaultLocales())
.build());
}
}
/**
@@ -291,14 +295,17 @@ public interface TextClassifier {
@IntRange(from = 0) int startIndex,
@IntRange(from = 0) int endIndex,
@Nullable TextClassification.Options options) {
final TextClassification.Request request = options.getRequest() != null
? options.getRequest()
: new TextClassification.Request.Builder(
text, startIndex, endIndex)
.setDefaultLocales(options.getDefaultLocales())
.setReferenceTime(options.getReferenceTime())
.build();
return classifyText(request);
if (options == null) {
return classifyText(
new TextClassification.Request.Builder(text, startIndex, endIndex).build());
} else if (options.getRequest() != null) {
return classifyText(options.getRequest());
} else {
return classifyText(new TextClassification.Request.Builder(text, startIndex, endIndex)
.setDefaultLocales(options.getDefaultLocales())
.setReferenceTime(options.getReferenceTime())
.build());
}
}
/**
@@ -326,13 +333,16 @@ public interface TextClassifier {
/** @hide */
default TextLinks generateLinks(
@NonNull CharSequence text, @Nullable TextLinks.Options options) {
final TextLinks.Request request = options.getRequest() != null
? options.getRequest()
: new TextLinks.Request.Builder(text)
.setDefaultLocales(options.getDefaultLocales())
.setEntityConfig(options.getEntityConfig())
.build();
return generateLinks(request);
if (options == null) {
return generateLinks(new TextLinks.Request.Builder(text).build());
} else if (options.getRequest() != null) {
return generateLinks(options.getRequest());
} else {
return generateLinks(new TextLinks.Request.Builder(text)
.setDefaultLocales(options.getDefaultLocales())
.setEntityConfig(options.getEntityConfig())
.build());
}
}
/**