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

Commit 09ae9e8e authored by Chen Xu's avatar Chen Xu Committed by Hall Liu
Browse files

telephony-stack util API lib 

attach copyable hidden util API classes to create a jar
file containing these, and statically link it from
telephony mainline modules. Need to jarjar those classes
otherwise classloader will load classes with the same
name in boot class path(framework.jar)

Bug: 137202333
Test: Manual & Build
Change-Id: Ibeca143f472d46b9ebd545d04bb6b8bae984cfbc
Merged-In: Ibeca143f472d46b9ebd545d04bb6b8bae984cfbc
parent 987e032f

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -45,11 +45,12 @@ java_library { 
    },

    srcs: [

        ":opt-telephony-common-srcs",

        ":framework-telephony-stack-shared-srcs",

        "src/java/**/I*.aidl",

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

    ],



    jarjar_rules: ":framework-jarjar-rules",

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



    libs: [

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

jarjar-rules-shared.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
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

rule android.util.LocalLog* com.android.internal.telephony.LocalLog@1

rule android.util.Slog* com.android.internal.telephony.Slog@1

rule android.util.TimeUtils* com.android.internal.telephony.TimeUtils@1

rule com.android.internal.util.Preconditions* com.android.internal.telephony.Preconditions@1

rule com.android.internal.os.SomeArgs* com.android.internal.telephony.SomeArgs@1

rule com.android.internal.util.DumpUtils* com.android.internal.telephony.DumpUtils@1

rule com.android.internal.util.XmlUtils* com.android.internal.telephony.XmlUtils@1

rule com.android.internal.util.HexDump* com.android.internal.telephony.HexDump@1

rule com.android.internal.util.State* com.android.internal.telephony.State@1

rule com.android.internal.util.StateMachine* com.android.internal.telephony.StateMachine@1

rule com.android.internal.util.IndentingPrintWriter* com.android.internal.telephony.IndentingPrintWriter@1
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ import android.service.carrier.ICarrierMessagingCallback; 
import android.service.carrier.ICarrierMessagingService;

import android.service.carrier.MessagePdu;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.LocalLog;



import com.android.internal.telephony.LocalLog;

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



import org.junit.After;

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.os.IDeviceIdleController; 
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;
@@ -80,6 +79,7 @@ import com.android.internal.telephony.emergency.EmergencyNumberTracker; 
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;

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

+1 −1
Original line number 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.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;