apply jarjar rule for telephonyTest
apply jarjar rule for telephonyTest to avoid importing renamed util
class and avoid confusion
Bug: 137202333
Test: unit test
Change-Id: Ia408d961c16cc418a11e80361ed64d9304bbeb4c
Merged-In: Ia408d961c16cc418a11e80361ed64d9304bbeb4c
diff --git a/Android.bp b/Android.bp
index 457ec76..c567b99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,6 +35,10 @@
],
path: "src/java",
}
+filegroup {
+ name: "jarjar-rules-shared",
+ srcs: ["jarjar-rules-shared.txt"],
+}
java_library {
name: "telephony-common",
@@ -50,7 +54,7 @@
"src/java/**/*.logtags",
],
- jarjar_rules: "jarjar-rules-shared.txt",
+ jarjar_rules: ":jarjar-rules-shared",
libs: [
"android.hardware.radio-V1.0-java",
diff --git a/tests/telephonytests/Android.bp b/tests/telephonytests/Android.bp
index 772a9c9..91ff74f 100644
--- a/tests/telephonytests/Android.bp
+++ b/tests/telephonytests/Android.bp
@@ -25,4 +25,5 @@
platform_apis: true,
test_suites: ["device-tests"],
+ jarjar_rules: ":jarjar-rules-shared",
}
diff --git a/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java b/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
index 7982219..6c2faf0 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java
@@ -47,6 +47,7 @@
import android.os.Looper;
import android.os.Message;
import android.os.MessageQueue;
+import android.os.RegistrantList;
import android.os.ServiceManager;
import android.provider.BlockedNumberContract;
import android.provider.DeviceConfig;
@@ -79,7 +80,6 @@
import com.android.internal.telephony.imsphone.ImsExternalCallTracker;
import com.android.internal.telephony.imsphone.ImsPhone;
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.SimulatedCommandsVerifier;
import com.android.internal.telephony.uicc.IccCardStatus;
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java
index c990bf9..018747e 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java
@@ -69,8 +69,8 @@
import com.android.internal.telephony.dataconnection.DataConnection.ConnectionParams;
import com.android.internal.telephony.dataconnection.DataConnection.DisconnectParams;
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.StateMachine;
import com.android.server.pm.PackageManagerService;
import org.junit.After;
diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
index 7e3ce12..7058ce3 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
@@ -45,8 +45,8 @@
import com.android.internal.telephony.DctConstants;
import com.android.internal.telephony.TelephonyTest;
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.StateMachine;
import org.junit.After;
import org.junit.Before;
diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
index 3c0d689..3b23510 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
@@ -63,11 +63,11 @@
import com.android.internal.telephony.SmsConstants;
import com.android.internal.telephony.SmsHeader;
import com.android.internal.telephony.SmsStorageMonitor;
-import com.android.internal.telephony.StateMachine;
import com.android.internal.telephony.TelephonyTest;
import com.android.internal.telephony.cdma.CdmaInboundSmsHandler;
import com.android.internal.util.HexDump;
import com.android.internal.util.IState;
+import com.android.internal.util.StateMachine;
import org.junit.After;
import org.junit.Before;