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

Merge "Merge "Add additional logging for EMBMS edge cases" am: de57d0d024 am: 8b8591ce46" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-03-29 01:38:48 +00:00
committed by Android (Google) Code Review
parent f53bcef0e1 2b6911b9c8
commit 5d6febdc58
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/MbmsDownloadSession.java
View File

@@ -920,11 +920,11 @@ public class MbmsDownloadSession implements AutoCloseable {
try { try {
if (!token.createNewFile()) { if (!token.createNewFile()) {
throw new RuntimeException("Failed to create download token for request " throw new RuntimeException("Failed to create download token for request "
+ request); + request + ". Token location is " + token.getPath());
} }
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException("Failed to create download token for request " + request throw new RuntimeException("Failed to create download token for request " + request
+ " due to IOException " + e); + " due to IOException " + e + ". Attempted to write to " + token.getPath());
} }
} }

6
telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java
View File

@@ -297,7 +297,9 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
for (Uri tempFileUri : tempFiles) { for (Uri tempFileUri : tempFiles) {
if (verifyTempFilePath(context, request.getFileServiceId(), tempFileUri)) { if (verifyTempFilePath(context, request.getFileServiceId(), tempFileUri)) {
File tempFile = new File(tempFileUri.getSchemeSpecificPart()); File tempFile = new File(tempFileUri.getSchemeSpecificPart());
tempFile.delete(); if (!tempFile.delete()) {
Log.w(LOG_TAG, "Failed to delete temp file at " + tempFile.getPath());
}
} }
} }
} }
@@ -474,6 +476,8 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
if (!MbmsUtils.isContainedIn( if (!MbmsUtils.isContainedIn(
MbmsUtils.getEmbmsTempFileDirForService(context, serviceId), tempFile)) { MbmsUtils.getEmbmsTempFileDirForService(context, serviceId), tempFile)) {
Log.w(LOG_TAG, "File at " + path + " is not contained in the temp file root," +
" which is " + MbmsUtils.getEmbmsTempFileDirForService(context, serviceId));
return false; return false;
} }