diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 1f4a64f5c7f16..f9317eba4e274 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -764,6 +764,7 @@ bool BootAnimation::threadLoop() { // We have no bootanimation file, so we use the stock android logo // animation. if (mZipFileName.isEmpty()) { + ALOGD("No animation file"); result = android(); } else { result = movie(); @@ -1476,6 +1477,10 @@ bool BootAnimation::playAnimation(const Animation& animation) { part.backgroundColor[2], 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 // the system, display it. 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; } @@ -1684,6 +1692,8 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn) { return nullptr; } + ALOGD("%s is loaded successfully", fn.string()); + Animation *animation = new Animation; animation->fileName = fn; animation->zip = zip; diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index d94fafc6a5bf6..980ea5cd7f8cc 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -1476,12 +1476,21 @@ public final class Call { /** * Invoked when the RTT session failed to initiate for some reason, including rejection * by the remote party. + *

+ * This callback will ONLY be invoked to report a failure related to a user initiated + * session modification request (i.e. {@link Call#sendRttRequest()}). + *

+ * 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 reason One of the status codes defined in - * {@link android.telecom.Connection.RttModifyStatus}, with the exception of - * {@link android.telecom.Connection.RttModifyStatus#SESSION_MODIFY_REQUEST_SUCCESS}. + * {@link android.telecom.Connection.RttModifyStatus}, with the exception of + * {@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} diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 46454860ca955..49ad58550db8f 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1400,6 +1400,18 @@ public abstract class Connection extends Conferenceable { * Session modify request rejected by remote user. */ 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 {} } /**