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

Commit 17541395 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Rename Conference#setConnectionElapsedTime to clarity. 

Change name of conference connection elapsed time method to make it more
clear what it is for.  Updated documentation of this method and its
companion to make it more clear what they are for.

Test: Compile - this is a docs and naming change only.
Bug: 70639525
Change-Id: I02662cb0331cba0d1fe2d4353438a68f334f9192
parent af5b90ff

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -39337,8 +39337,8 @@ package android.telecom { 
    method public final void setActive();

    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionElapsedTime(long);

    method public final void setConnectionProperties(int);

    method public final void setConnectionStartElapsedRealTime(long);

    method public final void setConnectionTime(long);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);

telecomm/java/android/telecom/Conference.java

+19 −14
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import java.util.Arrays; 
import java.util.Collections;

import java.util.List;

import java.util.Locale;

import java.util.Objects;

import java.util.Set;

import java.util.concurrent.CopyOnWriteArrayList;

import java.util.concurrent.CopyOnWriteArraySet;
@@ -82,7 +81,7 @@ public abstract class Conference extends Conferenceable { 
    private int mConnectionProperties;

    private String mDisconnectMessage;

    private long mConnectTimeMillis = CONNECT_TIME_NOT_SPECIFIED;

    private long mConnectElapsedTimeMillis = CONNECT_TIME_NOT_SPECIFIED;

    private long mConnectionStartElapsedRealTime = CONNECT_TIME_NOT_SPECIFIED;

    private StatusHints mStatusHints;

    private Bundle mExtras;

    private Set<String> mPreviousExtraKeys;
@@ -584,30 +583,36 @@ public abstract class Conference extends Conferenceable { 
    }



    /**

     * Sets the connection start time of the {@code Conference}.  Should be specified in wall-clock

     * time returned by {@link System#currentTimeMillis()}.

     * Sets the connection start time of the {@code Conference}.  This is used in the call log to

     * indicate the date and time when the conference took place.

     * <p>

     * Should be specified in wall-clock time returned by {@link System#currentTimeMillis()}.

     * <p>

     * When setting the connection time, you should always set the connection elapsed time via

     * {@link #setConnectionElapsedTime(long)}.

     * {@link #setConnectionStartElapsedRealTime(long)} to ensure the duration is reflected.

     *

     * @param connectionTimeMillis The connection time, in milliseconds.

     * @param connectionTimeMillis The connection time, in milliseconds, as returned by

     *                             {@link System#currentTimeMillis()}.

     */

    public final void setConnectionTime(long connectionTimeMillis) {

        mConnectTimeMillis = connectionTimeMillis;

    }



    /**

     * Sets the elapsed time since system boot when the {@link Conference} was connected.

     * This is used to determine the duration of the {@link Conference}.

     * Sets the start time of the {@link Conference} which is the basis for the determining the

     * duration of the {@link Conference}.

     * <p>

     * You should use a value returned by {@link SystemClock#elapsedRealtime()} to ensure that time

     * zone changes do not impact the conference duration.

     * <p>

     * When setting the connection elapsed time, you should always set the connection time via

     * When setting this, you should also set the connection time via

     * {@link #setConnectionTime(long)}.

     *

     * @param connectionElapsedTime The connection time, as measured by

     * @param connectionStartElapsedRealTime The connection time, as measured by

     * {@link SystemClock#elapsedRealtime()}.

     */

    public final void setConnectionElapsedTime(long connectionElapsedTime) {

        mConnectElapsedTimeMillis = connectionElapsedTime;

    public final void setConnectionStartElapsedRealTime(long connectionStartElapsedRealTime) {

        mConnectionStartElapsedRealTime = connectionStartElapsedRealTime;

    }



    /**
@@ -642,8 +647,8 @@ public abstract class Conference extends Conferenceable { 
     * @return The elapsed time at which the {@link Conference} was connected.

     * @hide

     */

    public final long getConnectElapsedTime() {

        return mConnectElapsedTimeMillis;

    public final long getConnectionStartElapsedRealTime() {

        return mConnectionStartElapsedRealTime;

    }



    /**

telecomm/java/android/telecom/Connection.java

+1 −1
Original line number Diff line number Diff line
@@ -2292,7 +2292,7 @@ public abstract class Connection extends Conferenceable { 
     *

     * @hide

     */

    public final void setConnectElapsedTimeMillis(long connectElapsedTimeMillis) {

    public final void setConnectionStartElapsedRealTime(long connectElapsedTimeMillis) {

        mConnectElapsedTimeMillis = connectElapsedTimeMillis;

    }

telecomm/java/android/telecom/ConnectionService.java

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.app.Service; 
import android.content.ComponentName;

import android.content.Intent;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;
@@ -1975,7 +1974,7 @@ public abstract class ConnectionService extends Service { 
                            null : conference.getVideoProvider().getInterface(),

                    conference.getVideoState(),

                    conference.getConnectTimeMillis(),

                    conference.getConnectElapsedTime(),

                    conference.getConnectionStartElapsedRealTime(),

                    conference.getStatusHints(),

                    conference.getExtras());