commit 5d9e643bb25bcfc679cb87cc050324e132c748b0
author Lorenzo Colitti <lorenzo@google.com> Tue Jan 14 14:52:00 2020 +0900
committer Remi NGUYEN VAN <reminv@google.com> Wed Jan 15 02:57:24 2020 +0900
tree 7fef4402357274d633b59834cd710c9f156cdd22
parent 0e5999009d4a671d7e3e5c12abe9fa37d38a1d57

Use NetworkFactory from frameworks/libs/net.

This allows Telephony to avoid depending on hidden API for
NetworkFactory.

Test: atest FrameworksTelephonyTests
Bug: 138306002
Change-Id: Idb12389069c4c95bf09dc835186358ebeb1f9d76

Android.bp

diff --git a/Android.bp b/Android.bp
index ca895be..21d4c0f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,6 +71,7 @@
     srcs: [
         ":opt-telephony-common-srcs",
         ":framework-telephony-stack-shared-srcs",
+        ":net-utils-telephony-common-srcs",
         "src/java/**/I*.aidl",
         "src/java/**/*.logtags",
     ],

jarjar-rules-shared.txt

diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt
index a6e5412..4ba3caf 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.BasicShellCommandHandler* com.android.internal.telephony.BasicShellCommandHandler@1
 rule android.os.RegistrantList* com.android.internal.telephony.RegistrantList@1
 rule android.os.Registrant* com.android.internal.telephony.Registrant@1

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

diff --git a/tests/telephonytests/src/com/android/internal/telephony/PhoneFactoryTest.java b/tests/telephonytests/src/com/android/internal/telephony/PhoneFactoryTest.java
index 2f03537..d1aea03 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 @@
 
 import static org.junit.Assert.fail;
 
-import android.net.NetworkFactory;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.junit.Test;
@@ -28,25 +27,25 @@
     @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) {
         }

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

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 e9d360c..51ff66d 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;