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

Commit beba968c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update API documentation for onRttInitiationFailure." am: 7ee20f28... 

Merge "Update API documentation for onRttInitiationFailure." am: 7ee20f28 am: 5badbebb am: 2e658ce6 am: bf1d98de

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

Change-Id: I00ec7520c2541eb5421aa42518069618a74027f1
parents 56f250b0 bf1d98de

cmds/bootanimation/BootAnimation.cpp

+10 −0
Original line number Original line Diff line number Diff line
@@ -764,6 +764,7 @@ bool BootAnimation::threadLoop() { 
    // We have no bootanimation file, so we use the stock android logo

    // We have no bootanimation file, so we use the stock android logo

    // animation.

    // animation.

    if (mZipFileName.isEmpty()) {

    if (mZipFileName.isEmpty()) {

        ALOGD("No animation file");

        result = android();

        result = android();

    } else {

    } else {

        result = movie();

        result = movie();
@@ -1476,6 +1477,10 @@ bool BootAnimation::playAnimation(const Animation& animation) { 
                    part.backgroundColor[2],

                    part.backgroundColor[2],

                    1.0f);

                    1.0f);





            ALOGD("Playing files = %s/%s, Requested repeat = %d, playUntilComplete = %s",

                    animation.fileName.string(), part.path.string(), part.count,

                    part.playUntilComplete ? "true" : "false");



            // For the last animation, if we have progress indicator from

            // For the last animation, if we have progress indicator from

            // the system, display it.

            // the system, display it.

            int currentProgress = android::base::GetIntProperty(PROGRESS_PROP_NAME, 0);

            int currentProgress = android::base::GetIntProperty(PROGRESS_PROP_NAME, 0);
@@ -1609,6 +1614,9 @@ bool BootAnimation::playAnimation(const Animation& animation) { 
        }

        }

    }

    }





    ALOGD("%sAnimationShownTiming End time: %" PRId64 "ms", mShuttingDown ? "Shutdown" : "Boot",

            elapsedRealtime());



    return true;

    return true;

}

}
@@ -1684,6 +1692,8 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn) { 
        return nullptr;

        return nullptr;

    }

    }





    ALOGD("%s is loaded successfully", fn.string());



    Animation *animation =  new Animation;

    Animation *animation =  new Animation;

    animation->fileName = fn;

    animation->fileName = fn;

    animation->zip = zip;

    animation->zip = zip;

telecomm/java/android/telecom/Call.java

+12 −3
Original line number Original line Diff line number Diff line
@@ -1476,12 +1476,21 @@ public final class Call { 
        /**

        /**

         * Invoked when the RTT session failed to initiate for some reason, including rejection

         * Invoked when the RTT session failed to initiate for some reason, including rejection

         * by the remote party.

         * by the remote party.

         * <p>

         * This callback will ONLY be invoked to report a failure related to a user initiated

         * session modification request (i.e. {@link Call#sendRttRequest()}).

         * <p>

         * If a call is initiated with {@link TelecomManager#EXTRA_START_CALL_WITH_RTT} specified,

         * the availability of RTT can be determined by checking {@link Details#PROPERTY_RTT}

         * once the call enters state {@link Details#STATE_ACTIVE}.

         *

         * @param call The call which the RTT initiation failure occurred on.

         * @param call The call which the RTT initiation failure occurred on.

         * @param reason One of the status codes defined in

         * @param reason One of the status codes defined in

         *      {@link android.telecom.Connection.RttModifyStatus}, with the exception of

         *      {@link android.telecom.Connection.RttModifyStatus}, with the exception of

         *      {@link android.telecom.Connection.RttModifyStatus#SESSION_MODIFY_REQUEST_SUCCESS}.

         *      {@link android.telecom.Connection.RttModifyStatus#SESSION_MODIFY_REQUEST_SUCCESS}.

         */

         */

        public void onRttInitiationFailure(Call call, int reason) {}

        public void onRttInitiationFailure(Call call,

                @android.telecom.Connection.RttModifyStatus.RttSessionModifyStatus int reason) {}





        /**

        /**

         * Invoked when Call handover from one {@link PhoneAccount} to other {@link PhoneAccount}

         * Invoked when Call handover from one {@link PhoneAccount} to other {@link PhoneAccount}

telecomm/java/android/telecom/Connection.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -1400,6 +1400,18 @@ public abstract class Connection extends Conferenceable { 
         * Session modify request rejected by remote user.

         * Session modify request rejected by remote user.

         */

         */

        public static final int SESSION_MODIFY_REQUEST_REJECTED_BY_REMOTE = 5;

        public static final int SESSION_MODIFY_REQUEST_REJECTED_BY_REMOTE = 5;





        /**@hide*/

        @Retention(RetentionPolicy.SOURCE)

        @IntDef(prefix = "SESSION_MODIFY_REQUEST_", value = {

                SESSION_MODIFY_REQUEST_SUCCESS,

                SESSION_MODIFY_REQUEST_FAIL,

                SESSION_MODIFY_REQUEST_INVALID,

                SESSION_MODIFY_REQUEST_TIMED_OUT,

                SESSION_MODIFY_REQUEST_REJECTED_BY_REMOTE

        })

        public @interface RttSessionModifyStatus {}

    }

    }





    /**

    /**