diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-10-22 14:02:44 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2018-10-23 12:36:39 +0200 |
commit | 4152497cccd8f76f4a4fe30befdc6ba86186c6be (patch) | |
tree | 1e1f72d2e452a420f9d6c8bf087a110aaf50039e /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java | |
parent | 79fda661690cfd80371a22dc6327c027badb9303 (diff) | |
download | qtlocation-mapboxgl-4152497cccd8f76f4a4fe30befdc6ba86186c6be.tar.gz |
Revert "[android] - infer nullity"upstream/tvn-revert-nullify
This reverts commit 617742710852a5a958a13f2b659f8c307973e49d.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java index fc98a38319..7884033de7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java @@ -3,8 +3,6 @@ package com.mapbox.mapboxsdk.http; import android.content.res.AssetManager; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.log.Logger; @@ -22,7 +20,6 @@ class LocalRequestTask extends AsyncTask<String, Void, byte[]> { this.requestResponse = requestResponse; } - @Nullable @Override protected byte[] doInBackground(String... strings) { return loadFile(Mapbox.getApplicationContext().getAssets(), @@ -33,15 +30,14 @@ class LocalRequestTask extends AsyncTask<String, Void, byte[]> { } @Override - protected void onPostExecute(@Nullable byte[] bytes) { + protected void onPostExecute(byte[] bytes) { super.onPostExecute(bytes); if (bytes != null && requestResponse != null) { requestResponse.onResponse(bytes); } } - @Nullable - private static byte[] loadFile(AssetManager assets, @NonNull String path) { + private static byte[] loadFile(AssetManager assets, String path) { byte[] buffer = null; try (InputStream input = assets.open(path)) { int size = input.available(); |