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

Commit 5d9e643b authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Remi NGUYEN VAN
Browse files

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
parent 0e599900

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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",

    ],

jarjar-rules-shared.txt

+1 −0
Original line number Diff line number Diff line 
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

+4 −5
Original line number Diff line number Diff line
@@ -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) {

        }

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

+2 −3
Original line number Diff line number Diff line
@@ -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;