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

Commit df7ebf8c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge 1612756a on remote branch"

parents 91618b50 6c0ac3d7

src/java/com/android/internal/telephony/Connection.java

+10 −0
Original line number Diff line number Diff line
@@ -173,6 +173,16 @@ public abstract class Connection { 
     */

    public abstract long getConnectTime();



    /**

     * Set connection connect time in currentTimeMillis() format.

     * This API may be used to change connect time of the

     * Connection for scenarios like IMS Volte SRVCC where

     * connect time is transferred from PS Connection to CS.

     */

    public void setConnectTime(long timeInMillis) {

        Rlog.e(LOG_TAG, "setConnectTime() not implemented");

    }



    /**

     * Disconnect time in currentTimeMillis() format.

     * The time when this Connection makes a transition into ENDED or FAIL.

src/java/com/android/internal/telephony/cdma/CdmaConnection.java

+5 −0
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ public class CdmaConnection extends Connection { 
        return mConnectTime;

    }



    @Override

    public void setConnectTime(long timeInMillis) {

        mConnectTime = timeInMillis;

    }



    @Override

    public long getDisconnectTime() {

        return mDisconnectTime;

src/java/com/android/internal/telephony/gsm/GsmConnection.java

+5 −0
Original line number Diff line number Diff line
@@ -210,6 +210,11 @@ public class GsmConnection extends Connection { 
        return mConnectTime;

    }



    @Override

    public void setConnectTime(long timeInMillis) {

        mConnectTime = timeInMillis;

    }



    @Override

    public long getDisconnectTime() {

        return mDisconnectTime;

src/java/com/android/internal/telephony/uicc/RuimRecords.java

+9 −11
Original line number Diff line number Diff line
@@ -689,24 +689,22 @@ public final class RuimRecords extends IccRecords { 
     * We use this as a trigger to read records from the card.

     */

    void recordsRequired() {

        if (DBG) log("recordsRequired");

        if (DBG) log("recordsRequired mRecordsRequired = " + mRecordsRequired);

        if (!mRecordsRequired) {

            mRecordsRequired = true;



            // trigger to retrieve all records

            fetchRuimRecords();

        }

    }



    private void fetchRuimRecords() {

        /* Don't read records if we don't expect

         * anyone to ask for them

         *

         * If we have already requested records OR

         * records are not required by anyone OR

         * the app is not ready

         * then bail

         * If records are not required by anyone OR

         * the app is not ready then bail

         */

        if (mRecordsRequested || !mRecordsRequired

            || AppState.APPSTATE_READY != mParentApp.getState()) {

        if (!mRecordsRequired || AppState.APPSTATE_READY != mParentApp.getState()) {

            if (DBG) log("fetchRuimRecords: Abort fetching records rRecordsRequested = "

                            + mRecordsRequested

                            + " state = " + mParentApp.getState()