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

Merge "Throw exception from addServiceAnnouncement impl" am: a179e9f6e7

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

Change-Id: I62f10f5484e0262a3dd1adf12b89ce624ac0caa8
This commit is contained in:
Hall Liu
2020-06-12 23:03:40 +00:00
committed by Automerger Merge Worker
parent c31fa35b94 a179e9f6e7
commit 15b0dc5eb3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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. * 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, * 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 * @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 * group call server. If the size of this array is greater than the value of

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

@@ -234,7 +234,8 @@ public class MbmsDownloadServiceBase extends IMbmsDownloadService.Stub {
@Override @Override
public @MbmsErrors.MbmsError int addServiceAnnouncement( public @MbmsErrors.MbmsError int addServiceAnnouncement(
int subscriptionId, @NonNull byte[] contents) { int subscriptionId, @NonNull byte[] contents) {
return 0; throw new UnsupportedOperationException("addServiceAnnouncement not supported by"
+ " this middleware.");
} }
/** /**