diff options
| -rw-r--r-- | telephony/java/android/telephony/MbmsDownloadSession.java | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/MbmsDownloadSession.java b/telephony/java/android/telephony/MbmsDownloadSession.java index ce1b80c2c860..b11a8df8148c 100644 --- a/telephony/java/android/telephony/MbmsDownloadSession.java +++ b/telephony/java/android/telephony/MbmsDownloadSession.java @@ -814,11 +814,11 @@ public class MbmsDownloadSession implements AutoCloseable { try { if (!token.createNewFile()) { throw new RuntimeException("Failed to create download token for request " - + request); + + request + ". Token location is " + token.getPath()); } } catch (IOException e) { 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()); } } diff --git a/telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java b/telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java index b0c00c6284a6..fe7533f57b12 100644 --- a/telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java +++ b/telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java @@ -297,7 +297,9 @@ public class MbmsDownloadReceiver extends BroadcastReceiver { for (Uri tempFileUri : tempFiles) { if (verifyTempFilePath(context, request.getFileServiceId(), tempFileUri)) { 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( 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; } |