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

Commit 6ced9d82 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

apply jarjar rule for telephonyTest 

am: 42344f84

Change-Id: I1955b78172159a547d670811f5cc1b570a99b289
parents ca8c3d29 42344f84

Android.bp

+5 −1
Original line number Original line Diff line number Diff line
@@ -35,6 +35,10 @@ filegroup { 
    ],

    ],

    path: "src/java",

    path: "src/java",

}

}

filegroup {

    name: "jarjar-rules-shared",

    srcs: ["jarjar-rules-shared.txt"],

}





java_library {

java_library {

    name: "telephony-common",

    name: "telephony-common",
@@ -50,7 +54,7 @@ java_library { 
        "src/java/**/*.logtags",

        "src/java/**/*.logtags",

    ],

    ],





    jarjar_rules: "jarjar-rules-shared.txt",

    jarjar_rules: ":jarjar-rules-shared",





    libs: [

    libs: [

        "android.hardware.radio-V1.0-java",

        "android.hardware.radio-V1.0-java",

tests/telephonytests/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,4 +25,5 @@ android_test { 




    platform_apis: true,

    platform_apis: true,

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    jarjar_rules: ":jarjar-rules-shared",

}
 
}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ import android.os.IDeviceIdleController; 
import android.os.Looper;

import android.os.Looper;

import android.os.Message;

import android.os.Message;

import android.os.MessageQueue;

import android.os.MessageQueue;

import android.os.RegistrantList;

import android.os.ServiceManager;

import android.os.ServiceManager;

import android.provider.BlockedNumberContract;

import android.provider.BlockedNumberContract;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig;
@@ -79,7 +80,6 @@ import com.android.internal.telephony.emergency.EmergencyNumberTracker; 
import com.android.internal.telephony.imsphone.ImsExternalCallTracker;

import com.android.internal.telephony.imsphone.ImsExternalCallTracker;

import com.android.internal.telephony.imsphone.ImsPhone;

import com.android.internal.telephony.imsphone.ImsPhone;

import com.android.internal.telephony.imsphone.ImsPhoneCallTracker;

import com.android.internal.telephony.imsphone.ImsPhoneCallTracker;

import com.android.internal.telephony.RegistrantList;

import com.android.internal.telephony.test.SimulatedCommands;

import com.android.internal.telephony.test.SimulatedCommands;

import com.android.internal.telephony.test.SimulatedCommandsVerifier;

import com.android.internal.telephony.test.SimulatedCommandsVerifier;

import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.uicc.IccCardStatus;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,8 +69,8 @@ import com.android.internal.telephony.TelephonyTest; 
import com.android.internal.telephony.dataconnection.DataConnection.ConnectionParams;

import com.android.internal.telephony.dataconnection.DataConnection.ConnectionParams;

import com.android.internal.telephony.dataconnection.DataConnection.DisconnectParams;

import com.android.internal.telephony.dataconnection.DataConnection.DisconnectParams;

import com.android.internal.telephony.dataconnection.DataConnection.SetupResult;

import com.android.internal.telephony.dataconnection.DataConnection.SetupResult;

import com.android.internal.telephony.StateMachine;

import com.android.internal.util.IState;

import com.android.internal.util.IState;

import com.android.internal.util.StateMachine;

import com.android.server.pm.PackageManagerService;

import com.android.server.pm.PackageManagerService;





import org.junit.After;

import org.junit.After;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,8 +45,8 @@ import android.testing.TestableLooper; 
import com.android.internal.telephony.DctConstants;

import com.android.internal.telephony.DctConstants;

import com.android.internal.telephony.TelephonyTest;

import com.android.internal.telephony.TelephonyTest;

import com.android.internal.telephony.dataconnection.DataConnection.UpdateLinkPropertyResult;

import com.android.internal.telephony.dataconnection.DataConnection.UpdateLinkPropertyResult;

import com.android.internal.telephony.StateMachine;

import com.android.internal.util.IState;

import com.android.internal.util.IState;

import com.android.internal.util.StateMachine;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;