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

Merge "Remove verification for DownloadReceiver when failure"

Browse Source
This commit is contained in:
Brad Ebinger
2017-10-03 18:32:04 +00:00
committed by Gerrit Code Review
parent a830e83028 fce0c34863
commit f78beae681
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,6 +165,12 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
Log.w(LOG_TAG, "Download result did not include a result code. Ignoring."); Log.w(LOG_TAG, "Download result did not include a result code. Ignoring.");
return false; return false;
} }
// We do not need to verify below extras if the result is not success.
if (MbmsDownloadSession.RESULT_SUCCESSFUL !=
intent.getIntExtra(MbmsDownloadSession.EXTRA_MBMS_DOWNLOAD_RESULT,
MbmsDownloadSession.RESULT_CANCELLED)) {
return true;
}
if (!intent.hasExtra(MbmsDownloadSession.EXTRA_MBMS_DOWNLOAD_REQUEST)) { if (!intent.hasExtra(MbmsDownloadSession.EXTRA_MBMS_DOWNLOAD_REQUEST)) {
Log.w(LOG_TAG, "Download result did not include the associated request. Ignoring."); Log.w(LOG_TAG, "Download result did not include the associated request. Ignoring.");
return false; return false;

3
telephony/java/android/telephony/mbms/vendor/VendorUtils.java vendored
View File

@@ -38,8 +38,9 @@ public class VendorUtils {
/** /**
* The MBMS middleware should send this when a download of single file has completed or * The MBMS middleware should send this when a download of single file has completed or
* failed. Mandatory extras are * failed. The only mandatory extra is
* {@link MbmsDownloadSession#EXTRA_MBMS_DOWNLOAD_RESULT} * {@link MbmsDownloadSession#EXTRA_MBMS_DOWNLOAD_RESULT}
* and the following are required when the download has completed:
* {@link MbmsDownloadSession#EXTRA_MBMS_FILE_INFO} * {@link MbmsDownloadSession#EXTRA_MBMS_FILE_INFO}
* {@link MbmsDownloadSession#EXTRA_MBMS_DOWNLOAD_REQUEST} * {@link MbmsDownloadSession#EXTRA_MBMS_DOWNLOAD_REQUEST}
* {@link #EXTRA_TEMP_LIST} * {@link #EXTRA_TEMP_LIST}