Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev (58232838) · Commits · e / os / android_frameworks_base

Android.bp

+1 −71

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

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

		@@ -1223,70 +1220,3 @@ build = [
		"StubLibraries.bp",
		"ApiDocs.bp",
		]
		No newline at end of file

		// 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.5-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"],
		}

packages/Tethering/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ java_defaults {
		],
		libs: [
		"framework-tethering",
		"framework-telephony-stubs",
		"framework-wifi-stubs-systemapi",
		"unsupportedappusage",
		],

packages/Tethering/tests/unit/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ java_defaults {
		"ext",
		"framework-minus-apex",
		"framework-res",
		"framework-telephony-stubs",
		"framework-tethering",
		"framework-wifi-stubs-module_libs_api",
		],

telephony/framework-telephony-jarjar-rules.txt

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		rule android.telephony.Annotation* android.telephony.framework.Annotation@1
		rule android.util.RecurrenceRule* android.telephony.RecurrenceRule@1
		rule com.android.i18n.phonenumbers.** com.android.telephony.framework.phonenumbers.@1
		rule com.android.internal.os.SomeArgs* android.telephony.SomeArgs@1
		rule com.android.internal.util.BitwiseInputStream* android.telephony.BitwiseInputStream@1
		rule com.android.internal.util.BitwiseOutputStream* android.telephony.BitwiseOutputStream@1
		rule com.android.internal.util.Preconditions* android.telephony.Preconditions@1
		rule com.android.internal.util.IndentingPrintWriter* android.telephony.IndentingPrintWriter@1
		rule com.android.internal.util.HexDump* android.telephony.HexDump@1