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

Merge "Assert only one bitmap is provided to ContentSuggestionsService." into qt-qpr1-dev

Browse Source 
am: ecc65c6e34

Change-Id: Iaeb50e86668bc458226695e780f15221148b6706
This commit is contained in:
Satakshi Rana
2019-11-19 11:45:02 -08:00
committed by android-build-merger
parent 9ea516d006 ecc65c6e34
commit bcf751a427
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/service/contentsuggestions/ContentSuggestionsService.java
View File

@@ -64,6 +64,10 @@ public abstract class ContentSuggestionsService extends Service {
@Override @Override
public void provideContextImage(int taskId, GraphicBuffer contextImage, public void provideContextImage(int taskId, GraphicBuffer contextImage,
int colorSpaceId, Bundle imageContextRequestExtras) { int colorSpaceId, Bundle imageContextRequestExtras) {
if (imageContextRequestExtras.containsKey(ContentSuggestionsManager.EXTRA_BITMAP)
&& contextImage != null) {
throw new IllegalArgumentException("Two bitmaps provided; expected one.");
}
Bitmap wrappedBuffer = null; Bitmap wrappedBuffer = null;
if (imageContextRequestExtras.containsKey(ContentSuggestionsManager.EXTRA_BITMAP)) { if (imageContextRequestExtras.containsKey(ContentSuggestionsManager.EXTRA_BITMAP)) {