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

Commit a6e4590f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3436310, 3434392, 3435998, 3435077, 3435273, 3436350,... 

Merge cherrypicks of [3436310, 3434392, 3435998, 3435077, 3435273, 3436350, 3434393, 3434394, 3434395, 3434696, 3435999, 3434352, 3434353, 3434354, 3435080, 3436041, 3434355, 3435813, 3435082, 3435084, 3434396, 3434397, 3436061, 3436000] into oc-m2-release

Change-Id: I9e8ea405dd2625b99e122e6b31855acccf80c74c
parents 3da52ca3 4b39dd35

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

+2 −2
Original line number Diff line number Diff line
@@ -165,9 +165,9 @@ public abstract class InboundSmsHandler extends StateMachine { 
     * state */

    private static final int EVENT_STATE_TIMEOUT = 10;



    /** Timeout duration for EVENT_STATE_TIMEOUT */

    /** Timeout duration for EVENT_STATE_TIMEOUT (5 minutes) */

    @VisibleForTesting

    public static final int STATE_TIMEOUT = 30000;

    public static final int STATE_TIMEOUT = 5 * 60 * 1000;



    /** Wakelock release delay when returning to idle state. */

    private static final int WAKELOCK_TIMEOUT = 3000;

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+11 −3
Original line number Diff line number Diff line
@@ -2552,9 +2552,17 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                                && targetAccessTech != ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

                if (isHandoverFromWifi && imsCall.isVideoCall()) {

                    if (mNotifyHandoverVideoFromWifiToLTE && mIsDataEnabled) {

                        if (conn.getDisconnectCause() == DisconnectCause.NOT_DISCONNECTED) {

                            log("onCallHandover :: notifying of WIFI to LTE handover.");

                            conn.onConnectionEvent(

                                    TelephonyManager.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE, null);

                        } else {

                            // Call has already had a disconnect request issued by the user or is

                            // in the process of disconnecting; do not inform the UI of this as it

                            // is not relevant.

                            log("onCallHandover :: skip notify of WIFI to LTE handover for "

                                    + "disconnected call.");

                        }

                    }



                    if (!mIsDataEnabled && mIsViLteDataMetered) {

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.provider.Telephony;

import android.support.test.filters.FlakyTest;

import android.support.test.filters.LargeTest;

import android.support.test.filters.MediumTest;

import android.test.mock.MockContentResolver;
@@ -785,7 +786,7 @@ public class GsmInboundSmsHandlerTest extends TelephonyTest { 
    @FlakyTest

    @Ignore

    @Test

    @MediumTest

    @LargeTest

    public void testWaitingStateTimeout() throws Exception {

        transitionFromStartupToIdle();