Get rid of telephony-stubs.

It was added for telephony mainline and is currently not needed.

Test: basic telephony validity, TH
Bug: 170906882
Change-Id: Idbd05aeef055291fc50008129c30c4ae272c1ac0
This commit is contained in:
Amit Mahajan
2020-10-15 15:08:13 -07:00
parent fa01004977
commit 27d13cada5
6 changed files with 0 additions and 2225 deletions

View File

@@ -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",

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -1,19 +0,0 @@
// 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);
}
}

View File

@@ -1,10 +0,0 @@
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.FunctionalUtils* android.telephony.FunctionalUtils@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