Get rid of telephony-stubs. (27d13cad) · Commits · e / os / android_frameworks_base

Android.bp

+0 −87

Original line number	Diff line number	Diff line
		@@ -380,9 +380,6 @@ filegroup {
		// etc.
		":framework-javastream-protos",
		":statslog-framework-java-gen", // FrameworkStatsLog.java

		// telephony annotations
		":framework-telephony-annotations",
		],
		}

		@@ -1269,23 +1266,6 @@ filegroup {
		],
		}

		// Avoid including Parcelable classes as we don't want to have two copies of
		// Parcelable cross the process. This is used by framework-telephony (frameworks/base/telephony).
		filegroup {
		name: "framework-telephony-shared-srcs",
		srcs: [
		"core/java/android/util/IndentingPrintWriter.java",
		"core/java/android/util/RecurrenceRule.java",
		"core/java/com/android/internal/os/SomeArgs.java",
		"core/java/com/android/internal/util/BitwiseInputStream.java",
		"core/java/com/android/internal/util/BitwiseOutputStream.java",
		"core/java/com/android/internal/util/FunctionalUtils.java",
		"core/java/com/android/internal/util/HexDump.java",
		"core/java/com/android/internal/util/IndentingPrintWriter.java",
		"core/java/com/android/internal/util/Preconditions.java",
		],
		}

		// Avoid including Parcelable classes as we don't want to have two copies of
		// Parcelable cross the process.
		filegroup {
		@@ -1383,73 +1363,6 @@ build = [
		"ApiDocs.bp",
		]

		// TODO(b/147699819): move to frameworks/base/telephony/ folder
		droidstubs {
		name: "framework-telephony-stubs-srcs",
		srcs: [
		":framework-telephony-sources",
		":framework_native_aidl",
		":framework-javastream-protos",
		],
		aidl: {
		local_include_dirs: [
		"core/java",
		"telecomm/java"
		],
		},
		libs: [
		"framework-annotations-lib",
		"android.hardware.radio-V1.6-java",
		],
		check_api: {
		current: {
		// TODO(b/147699819): remove telephony prefix when moved
		api_file: "telephony/api/system-current.txt",
		removed_api_file: "telephony/api/system-removed.txt",
		},
		},
		// TODO: make telephony inherit the shared stubs and remove this
		args: "--show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
		"\\) " +
		"--error UnhiddenSystemApi " +
		"--hide BroadcastBehavior " +
		"--hide DeprecationMismatch " +
		"--hide HiddenSuperclass " +
		"--hide HiddenTypedefConstant " +
		"--hide HiddenTypeParameter " +
		"--hide MissingPermission " +
		"--hide RequiresPermission " +
		"--hide SdkConstant " +
		"--hide Todo " +
		"--hide Typo " +
		"--hide UnavailableSymbol ",
		filter_packages: ["android.telephony"],
		sdk_version: "system_current",
		}

		java_library {
		name: "framework-telephony-stubs",
		srcs: [":framework-telephony-stubs-srcs"],
		// TODO(b/147699819): move public aidls to a separate folder and potentially remove
		// below aidl exports.
		aidl: {
		export_include_dirs: ["telephony/java"],
		},
		sdk_version: "module_current",
		}

		filegroup {
		// TODO (b/147690217): move to frameworks/base/telephony/common.
		name: "framework-telephony-annotations",
		srcs: ["telephony/java/android/telephony/Annotation.java"],
		}

		filegroup {
		name: "framework-telephony-jarjar-rules",
		srcs: ["telephony/framework-telephony-jarjar-rules.txt"],
		}

		// protolog start
		filegroup {
		name: "protolog-common-src",

packages/Tethering/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ java_defaults {
		libs: [
		"framework-statsd.stubs.module_lib",
		"framework-tethering.impl",
		"framework-telephony-stubs",
		"framework-wifi",
		"unsupportedappusage",
		],

packages/Tethering/tests/unit/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ java_defaults {
		"ext",
		"framework-minus-apex",
		"framework-res",
		"framework-telephony-stubs",
		"framework-tethering.impl",
		"framework-wifi.stubs.module_lib",
		],

telephony/api/system-current.txt

deleted100644 → 0

+0 −2107

File deleted.

Preview size limit exceeded, changes collapsed.

telephony/api/system-removed.txt

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		package android.telephony {

		public class TelephonyManager {
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
		method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();
		method @Deprecated public void silenceRinger();
		}

		}

		package android.telephony.data {

		public final class DataCallResponse implements android.os.Parcelable {
		ctor public DataCallResponse(int, int, int, int, int, @Nullable String, @Nullable java.util.List<android.net.LinkAddress>, @Nullable java.util.List<java.net.InetAddress>, @Nullable java.util.List<java.net.InetAddress>, @Nullable java.util.List<java.net.InetAddress>, int);
		}

		}