diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-07-11 01:08:28 -0700 |
|---|---|---|
| committer | Jatin Matani <jatinm@google.com> | 2015-07-11 01:08:28 -0700 |
| commit | 5abefbb8d6e2a4bfe824d9c2d8904600d41f9387 (patch) | |
| tree | 1c344e3a6deefc5bf4fd3fcc7a504f7b1491c5f8 /java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java | |
| parent | 1791ce07522f938a349eedeb22223449abe6c380 (diff) | |
| parent | 9cd60fe1bb67cec755c1cee6d541272e64129072 (diff) | |
| download | latinime-5abefbb8d6e2a4bfe824d9c2d8904600d41f9387.tar.gz latinime-5abefbb8d6e2a4bfe824d9c2d8904600d41f9387.tar.xz latinime-5abefbb8d6e2a4bfe824d9c2d8904600d41f9387.zip | |
resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp
Change-Id: I1aad861d711170ab3dab0019d8e4ff02f058c423
Diffstat (limited to 'java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java')
| -rw-r--r-- | java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java b/java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java index 3dbbc9b9b..6f6b02637 100644 --- a/java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java +++ b/java/src/com/android/inputmethod/dictionarypack/DownloadManagerWrapper.java @@ -27,6 +27,8 @@ import android.util.Log; import java.io.FileNotFoundException; +import javax.annotation.Nullable; + /** * A class to help with calling DownloadManager methods. * @@ -78,6 +80,7 @@ public class DownloadManagerWrapper { throw new FileNotFoundException(); } + @Nullable public Cursor query(final Query query) { try { if (null != mDownloadManager) { |