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

resolve merge conflicts of b4a5615 to lmp-dev

Browse Source 
am: 288166cbb2

Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255
This commit is contained in:
David Christie
2016-08-12 20:09:54 +00:00
committed by android-build-merger
parent 3d58e326d9 288166cbb2
commit b7f8b59e24
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,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 Context mContext;
@@ -150,8 +151,9 @@ public class GpsXtraDownloader {
byte[] body = null;
if (entity != null) {
try {
if (entity.getContentLength() > 0) {
body = new byte[(int) entity.getContentLength()];
long contentLength = entity.getContentLength();
if (contentLength > 0 && contentLength <= MAXIMUM_CONTENT_LENGTH_BYTES) {
body = new byte[(int) contentLength];
DataInputStream dis = new DataInputStream(entity.getContent());
try {
dis.readFully(body);