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

Commit 8b141185 authored Dec 02, 2019 by Hall Liu

Stop linking telephony-common from Telecom

For mainline decoupling, don't link telephony-common anymore. None of
its APIs are being used in Telecom either.

Fixes: 141576016
Test: compiles
Change-Id: I97039ce6aea666f35d83db8dc3cd6ac4ef087bc6

parent a58ac65d

Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	// Build the Telecom service.		// Build the Telecom service.
	android_app {		android_app {
	name: "Telecom",		name: "Telecom",
	libs: ["telephony-common"],
	srcs: [		srcs: [
	"src/*/.java",		"src/*/.java",
	"proto/*/.proto",		"proto/*/.proto",
	@@ -53,7 +52,6 @@ android_test {
	"android.test.mock",		"android.test.mock",
	"android.test.base",		"android.test.base",
	"android.test.runner",		"android.test.runner",
	"telephony-common",
	],		],

	jni_libs: ["libdexmakerjvmtiagent"],		jni_libs: ["libdexmakerjvmtiagent"],

src/com/android/server/telecom/CallsManager.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,6 @@ import android.text.TextUtils;
	import android.util.Pair;		import android.util.Pair;

	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	import com.android.internal.telephony.AsyncEmergencyContactNotifier;
	import android.telecom.CallerInfo;		import android.telecom.CallerInfo;
	import com.android.internal.telephony.PhoneConstants;		import com.android.internal.telephony.PhoneConstants;
	import com.android.internal.telephony.TelephonyProperties;		import com.android.internal.telephony.TelephonyProperties;

src/com/android/server/telecom/callfiltering/BlockCheckerAdapter.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,6 @@ import android.os.Bundle;
	import android.provider.BlockedNumberContract;		import android.provider.BlockedNumberContract;
	import android.telecom.Log;		import android.telecom.Log;

	import com.android.internal.telephony.BlockChecker;

	public class BlockCheckerAdapter {		public class BlockCheckerAdapter {
	private static final String TAG = BlockCheckerAdapter.class.getSimpleName();		private static final String TAG = BlockCheckerAdapter.class.getSimpleName();