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

Commit 6adb24da authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Throw exception from addServiceAnnouncement impl" am: a179e9f6 am:... 

Merge "Throw exception from addServiceAnnouncement impl" am: a179e9f6 am: 15b0dc5e am: dd1aa9dc am: e9fd2d37

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322368

Change-Id: Idba9220be79e490ef8f50815794e138ea93c454e
parents 3bf68b06 e9fd2d37

telephony/java/android/telephony/MbmsDownloadSession.java

+2 −1
Original line number Diff line number Diff line
@@ -453,7 +453,8 @@ public class MbmsDownloadSession implements AutoCloseable { 
     * callback may include any of the errors that are not specific to the streaming use-case.

     *

     * May throw an {@link IllegalStateException} when the middleware has not yet been bound,

     * or an {@link IllegalArgumentException} if the byte array is too large.

     * or an {@link IllegalArgumentException} if the byte array is too large, or an

     * {@link UnsupportedOperationException} if the middleware has not implemented this method.

     *

     * @param contents The contents of the service announcement descriptor received from the

     *                     group call server. If the size of this array is greater than the value of

telephony/java/android/telephony/mbms/vendor/MbmsDownloadServiceBase.java

+2 −1
Original line number Diff line number Diff line
@@ -234,7 +234,8 @@ public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub { 
    @Override

    public @MbmsErrors.MbmsError int addServiceAnnouncement(

            int subscriptionId, @NonNull byte[] contents) {

        return 0;

        throw new UnsupportedOperationException("addServiceAnnouncement not supported by"

                + " this middleware.");

    }



    /**