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

am: ecc65c6e34

Change-Id: Iaeb50e86668bc458226695e780f15221148b6706

core/java/android/service/contentsuggestions/ContentSuggestionsService.java

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