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

Commit a4e86702 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

resolve merge conflicts of 210c4f00 to master 

Change-Id: I8f4471ec00ba38b3635bbd904586c5ade0a5a4d4
parents 8911c727 210c4f00

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaCallTrackerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.telephony; 
import android.os.HandlerThread;

import android.os.PersistableBundle;

import android.telephony.CarrierConfigManager;

import android.platform.test.annotations.Postsubmit;

import android.telephony.DisconnectCause;

import android.telephony.PhoneNumberUtils;

import android.telephony.ServiceState;
@@ -175,6 +176,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 


    }



    @Postsubmit

    @Test

    @MediumTest

    public void testMOCallPendingHangUp() {

tests/telephonytests/src/com/android/internal/telephony/GsmCdmaPhoneTest.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        mPhoneUT.sendMessage(mPhoneUT.obtainMessage(GsmCdmaPhone.EVENT_VOICE_RADIO_TECH_CHANGED,

                new AsyncResult(null, new int[]{ServiceState.RIL_RADIO_TECHNOLOGY_IS95A}, null)));

        //wait for voice RAT to be updated

        waitForMs(50);

        waitForMs(100);

        assertEquals(PhoneConstants.PHONE_TYPE_CDMA, mPhoneUT.getPhoneType());

    }

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.Process; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.os.WorkSource;

import android.platform.test.annotations.Postsubmit;

import android.telephony.CellInfo;

import android.telephony.CellInfoGsm;

import android.telephony.ServiceState;
@@ -316,6 +317,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        assertFalse(sst.isImsRegistered());

    }



    @Postsubmit

    @Test

    @MediumTest

    public void testSignalStrength() {

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.HandlerThread; 
import android.os.IBinder;

import android.os.Message;

import android.os.PersistableBundle;

import android.platform.test.annotations.Postsubmit;

import android.provider.Settings;

import android.provider.Telephony;

import android.telephony.CarrierConfigManager;
@@ -655,6 +656,7 @@ public class DcTrackerTest extends TelephonyTest { 
        waitForMs(200);

    }



    @Postsubmit

    @Test

    @MediumTest

    public void testDataCallOnUserDisableRoaming() throws Exception {
@@ -765,6 +767,7 @@ public class DcTrackerTest extends TelephonyTest { 
    }



    // Test for API carrierActionSetMeteredApnsEnabled.

    @Postsubmit

    @Test

    @MediumTest

    public void testCarrierActionSetMeteredApnsEnabled() throws Exception {

tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.Handler; 
import android.os.HandlerThread;

import android.os.Looper;

import android.os.Message;

import android.platform.test.annotations.Postsubmit;

import android.net.ConnectivityManager;

import android.net.IConnectivityManager;

import android.net.NetworkCapabilities;
@@ -133,6 +134,7 @@ public class TelephonyNetworkFactoryTest extends AndroidTestCase { 
    /**

     * Test that phone active changes cause the DcTracker to get poked.

     */

    @Postsubmit

    @SmallTest

    public void testActive() throws Exception {

        mTestName = "testActive";