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

resolve merge conflicts of a2399b4 to mnc-dev

Browse Source 
am: 6195acc2b5

Change-Id: I34c3133924af9906b88ebd5faf78e0c000aa05be
This commit is contained in:
David Christie
2016-08-24 22:16:07 +00:00
committed by android-build-merger
parent 02e9affa42 6195acc2b5
commit e24eb2dbb5
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/location/GpsXtraDownloader.java
View File

@@ -21,8 +21,9 @@ import android.util.Log;
import java.net.HttpURLConnection;
import java.net.URL;
import libcore.io.Streams;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.IOException;
import java.util.Properties;
import java.util.Random;
@@ -36,6 +37,7 @@ public class GpsXtraDownloader {
private static final String TAG = "GpsXtraDownloader";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private static final long MAXIMUM_CONTENT_LENGTH_BYTES = 1000000; // 1MB.
private static final String DEFAULT_USER_AGENT = "Android";
private final String[] mXtraServers;
@@ -121,7 +123,19 @@ public class GpsXtraDownloader {
return null;
}
return Streams.readFully(connection.getInputStream());
try (InputStream in = connection.getInputStream()) {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
int count;
while ((count = in.read(buffer)) != -1) {
bytes.write(buffer, 0, count);
if (bytes.size() > MAXIMUM_CONTENT_LENGTH_BYTES) {
if (DEBUG) Log.d(TAG, "XTRA file too large");
return null;
}
}
return bytes.toByteArray();
}
} catch (IOException ioe) {
if (DEBUG) Log.d(TAG, "Error downloading gps XTRA: ", ioe);
} finally {
@@ -133,3 +147,4 @@ public class GpsXtraDownloader {
}
}