diff options
4 files changed, 8 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index 693da7c04b..45cd7f8444 100644 --- a/Android.bp +++ b/Android.bp @@ -71,6 +71,7 @@ java_library { srcs: [ ":opt-telephony-common-srcs", ":framework-telephony-stack-shared-srcs", + ":net-utils-telephony-common-srcs", "src/java/**/I*.aidl", "src/java/**/*.logtags", ], diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt index aa887daab6..3c6ff91017 100644 --- a/jarjar-rules-shared.txt +++ b/jarjar-rules-shared.txt @@ -1,3 +1,4 @@ +rule android.net.NetworkFactory* com.android.internal.telephony.NetworkFactory@1 rule android.os.RegistrantList* com.android.internal.telephony.RegistrantList@1 rule android.os.Registrant* com.android.internal.telephony.Registrant@1 rule android.hidl.** android.internal.hidl.@1 diff --git a/tests/telephonytests/src/com/android/internal/telephony/PhoneFactoryTest.java b/tests/telephonytests/src/com/android/internal/telephony/PhoneFactoryTest.java index 2f03537f3e..d1aea0334c 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/PhoneFactoryTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/PhoneFactoryTest.java @@ -18,7 +18,6 @@ package com.android.internal.telephony; import static org.junit.Assert.fail; -import android.net.NetworkFactory; import android.test.suitebuilder.annotation.SmallTest; import org.junit.Test; @@ -28,25 +27,25 @@ public class PhoneFactoryTest { @SmallTest public void testBeforeMakePhone() { try { - Phone phone = PhoneFactory.getDefaultPhone(); + PhoneFactory.getDefaultPhone(); fail("Expecting IllegalStateException"); } catch (IllegalStateException e) { } try { - Phone phone = PhoneFactory.getPhone(0); + PhoneFactory.getPhone(0); fail("Expecting IllegalStateException"); } catch (IllegalStateException e) { } try { - Phone[] phone = PhoneFactory.getPhones(); + PhoneFactory.getPhones(); fail("Expecting IllegalStateException"); } catch (IllegalStateException e) { } try { - NetworkFactory factory = PhoneFactory.getNetworkFactory(0); + PhoneFactory.getNetworkFactory(0); fail("Expecting IllegalStateException"); } catch (IllegalStateException e) { } diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java index 8f7bc4fe79..0aa2a4d173 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java @@ -16,9 +16,8 @@ package com.android.internal.telephony.dataconnection; -import static android.net.NetworkFactory.CMD_CANCEL_REQUEST; -import static android.net.NetworkFactory.CMD_REQUEST_NETWORK; - +import static com.android.internal.telephony.NetworkFactory.CMD_CANCEL_REQUEST; +import static com.android.internal.telephony.NetworkFactory.CMD_REQUEST_NETWORK; import static com.android.internal.telephony.dataconnection.TelephonyNetworkFactory.EVENT_ACTIVE_PHONE_SWITCH; import static org.junit.Assert.assertEquals; |