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

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

Merge "Improve docs for uploadCallComposerPicture" into sc-dev am: f4f96c16 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7201429cb327feff787494dbbdb9aea0efcae38
parents e0af338f f4f96c16

telephony/java/android/telephony/TelephonyManager.java

+7 −1
Original line number Diff line number Diff line
@@ -4461,6 +4461,10 @@ public class TelephonyManager { 
     * This functionality is only available to the app filling the {@link RoleManager#ROLE_DIALER}

     * role on the device.

     *

     * This functionality is only available when

     * {@link CarrierConfigManager#KEY_SUPPORTS_CALL_COMPOSER_BOOL} is set to {@code true} in the

     * bundle returned from {@link #getCarrierConfig()}.

     *

     * @param pictureToUpload An {@link InputStream} that supplies the bytes representing the

     *                        picture to upload. The client bears responsibility for closing this

     *                        stream after {@code callback} is called with success or failure.
@@ -4469,7 +4473,9 @@ public class TelephonyManager { 
     *                        of {@link #getMaximumCallComposerPictureSize()}, the upload will be

     *                        aborted and the callback will be called with an exception containing

     *                        {@link CallComposerException#ERROR_FILE_TOO_LARGE}.

     * @param contentType The MIME type of the picture you're uploading (e.g. image/jpeg)

     * @param contentType The MIME type of the picture you're uploading (e.g. image/jpeg). The list

     *                    of acceptable content types can be found at 3GPP TS 26.141 sections

     *                    4.2 and 4.3.

     * @param executor The {@link Executor} on which the {@code pictureToUpload} stream will be

     *                 read, as well as on which the callback will be called.

     * @param callback A callback called when the upload operation terminates, either in success