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

Merge "Update API documentation for onRttInitiationFailure." am: 7ee20f2830 am: 5badbebbf9 am: 2e658ce6fe am: bf1d98de72

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

Change-Id: I00ec7520c2541eb5421aa42518069618a74027f1
This commit is contained in:
Treehugger Robot
2022-03-04 03:28:01 +00:00
committed by Automerger Merge Worker
parent 56f250b088 bf1d98de72
commit beba968cf6
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmds/bootanimation/BootAnimation.cpp
View File

@@ -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;

15
telecomm/java/android/telecom/Call.java
View File

@@ -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.
* <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 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}

12
telecomm/java/android/telecom/Connection.java
View File

@@ -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 {}
}
/**