diff options
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | jarjar-rules-shared.txt | 4 | ||||
| -rwxr-xr-x | src/java/com/android/ims/ImsCall.java | 3 | ||||
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 7 |
4 files changed, 23 insertions, 5 deletions
@@ -23,6 +23,16 @@ java_library { aidl: { local_include_dirs: ["src/java"], }, - srcs: ["src/java/**/*.java"], - libs: ["unsupportedappusage"], + srcs: [ + "src/java/**/*.java", + ":framework-ims-common-shared-srcs", + ], + + libs: [ + "unsupportedappusage", + "framework-telephony", + // TODO link to framework-minus-apex stub and framework-wifi-stubs + ], + + jarjar_rules: "jarjar-rules-shared.txt", } diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt new file mode 100644 index 00000000..aa761180 --- /dev/null +++ b/jarjar-rules-shared.txt @@ -0,0 +1,4 @@ +rule android.os.RegistrantList* com.android.ims.RegistrantList@1 +rule android.os.Registrant* com.android.ims.Registrant@1 +rule com.android.internal.os.SomeArgs* com.android.ims.SomeArgs@1 +rule com.android.internal.util.Preconditions* com.android.ims.Preconditions@1 diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 37b4b4ad..f61e734b 100755 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -23,6 +23,7 @@ import android.os.Bundle; import android.os.Message; import android.os.Parcel; import android.telecom.Call; +import com.android.ims.internal.ConferenceParticipant; import android.telecom.Connection; import android.telephony.CallQuality; import android.telephony.ServiceState; @@ -36,7 +37,6 @@ import android.telephony.ims.ImsSuppServiceNotification; import android.text.TextUtils; import android.util.Log; -import com.android.ims.internal.ConferenceParticipant; import com.android.ims.internal.ICall; import com.android.ims.internal.ImsStreamMediaSession; import com.android.internal.annotations.VisibleForTesting; @@ -46,6 +46,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map.Entry; +import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 2e696ba7..454429fe 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -28,13 +28,13 @@ import android.os.Message; import android.os.Parcel; import android.os.PersistableBundle; import android.os.RemoteException; -import android.os.ServiceManager; import android.os.SystemProperties; import android.provider.Settings; import android.telecom.TelecomManager; import android.telephony.AccessNetworkConstants; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; +import android.telephony.TelephonyFrameworkInitializer; import android.telephony.TelephonyManager; import android.telephony.ims.ImsCallProfile; import android.telephony.ims.ImsCallSession; @@ -1476,7 +1476,10 @@ public class ImsManager implements IFeatureConnector { boolean isProvisioned = true; if (requiresProvisioning) { ITelephony telephony = ITelephony.Stub.asInterface( - ServiceManager.getService(Context.TELEPHONY_SERVICE)); + TelephonyFrameworkInitializer + .getTelephonyServiceManager() + .getTelephonyServiceRegisterer() + .get()); // Only track UT over LTE, since we do not differentiate between UT over LTE and IWLAN // currently. try { |