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

Commit b56ece87 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 10 into master 

Bug: 139893257
Change-Id: I2ae90578184e93c49e2bd3a5d0d285ab3bd45535
parents bdb30882 ad774237

src/java/com/android/ims/ImsCall.java

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.net.Uri; 
import android.os.Bundle;

import android.os.Message;

import android.os.Parcel;

import android.telecom.Call;

import android.telecom.ConferenceParticipant;

import android.telecom.Connection;

import android.telephony.Rlog;
@@ -1873,7 +1874,7 @@ public class ImsCall implements ICall { 


            if (connectionState != Connection.STATE_DISCONNECTED) {

                ConferenceParticipant conferenceParticipant = new ConferenceParticipant(handle,

                        displayName, endpointUri, connectionState);

                        displayName, endpointUri, connectionState, Call.Details.DIRECTION_UNKNOWN);

                mConferenceParticipants.add(conferenceParticipant);

            }

        }

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ android_test { 
    ],



    static_libs: [

        "android-support-test",

        "androidx.test.rules",

        "mockito-target-minus-junit4",

    ],

}

tests/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 


    <!--

        To run all tests:

            adb shell am instrument -w com.android.ims.tests/android.support.test.runner.AndroidJUnitRunner

            adb shell am instrument -w com.android.ims.tests/androidx.test.runner.AndroidJUnitRunner



        To run a single class test:

            adb shell am instrument -e class com.android.ims.unit.FooUnitTest -w com.android.ims.tests/android.support.test.runner.AndroidJUnitRunner

            adb shell am instrument -e class com.android.ims.unit.FooUnitTest -w com.android.ims.tests/androidx.test.runner.AndroidJUnitRunner

    -->

    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.ims.tests"

        android:label="Ims Common Tests" />

</manifest>

tests/src/com/android/ims/ImsConfigTest.java

+5 −4
Original line number Diff line number Diff line
@@ -16,19 +16,20 @@ 


package com.android.ims;



import android.support.test.runner.AndroidJUnit4;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.verify;



import android.telephony.ims.aidl.IImsConfig;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;



import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.verify;



/**

 * Unit Tests for ImsConfig

 */

tests/src/com/android/ims/ImsTestBase.java

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ package com.android.ims; 
import android.content.Context;

import android.os.Handler;

import android.os.Looper;

import android.support.test.InstrumentationRegistry;



import androidx.test.InstrumentationRegistry;



import org.mockito.MockitoAnnotations;