Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 354eed7b authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Remove verification for DownloadReceiver when failure" 

am: f78beae6

Change-Id: I02bc76b2162234c2f063e3dd7f143449a091f012
parents 768b6c5e f78beae6

telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -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;

telephony/java/android/telephony/mbms/vendor/VendorUtils.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -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}