Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove framework-connectivity-proto from platform" am: 90a441ea64 am: ff4a929538

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2063314

Change-Id: I98bca4cb7153ccb0220b14757e1842ba0ecd8874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Huang
2022-10-21 21:21:40 +00:00
committed by Automerger Merge Worker
parent 34b40ae557 ff4a929538
commit 4d01f32ef9
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ProtoLibraries.bp
View File

@@ -35,7 +35,6 @@ gensrcs {
"&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)", "&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)",
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -68,7 +67,6 @@ gensrcs {
" $(in)", " $(in)",
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -84,7 +82,6 @@ gensrcs {
java_library_host { java_library_host {
name: "platformprotos", name: "platformprotos",
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -124,7 +121,6 @@ java_library {
], ],
sdk_version: "9", sdk_version: "9",
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -147,7 +143,6 @@ java_library {
}, },
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",
@@ -185,7 +180,6 @@ cc_defaults {
], ],
srcs: [ srcs: [
":framework-connectivity-protos",
":ipconnectivity-proto-src", ":ipconnectivity-proto-src",
":libstats_atom_enum_protos", ":libstats_atom_enum_protos",
":libstats_atom_message_protos", ":libstats_atom_message_protos",

7
core/proto/android/os/incident.proto
View File

@@ -61,7 +61,6 @@ import "frameworks/base/core/proto/android/util/textdump.proto";
import "frameworks/base/core/proto/android/privacy.proto"; import "frameworks/base/core/proto/android/privacy.proto";
import "frameworks/base/core/proto/android/section.proto"; import "frameworks/base/core/proto/android/section.proto";
import "frameworks/base/proto/src/ipconnectivity.proto"; import "frameworks/base/proto/src/ipconnectivity.proto";
import "packages/modules/Connectivity/framework/proto/netstats.proto";
import "packages/modules/Permission/service/proto/role_service.proto"; import "packages/modules/Permission/service/proto/role_service.proto";
package android.os; package android.os;
@@ -247,11 +246,7 @@ message IncidentProto {
(section).args = "fingerprint --proto --incident" (section).args = "fingerprint --proto --incident"
]; ];
optional android.service.NetworkStatsServiceDumpProto netstats = 3001 [ reserved 3001;
(section).type = SECTION_DUMPSYS,
(section).args = "netstats --proto",
(section).userdebug_and_eng_only = true
];
optional android.providers.settings.SettingsServiceDumpProto settings = 3002 [ optional android.providers.settings.SettingsServiceDumpProto settings = 3002 [
(section).type = SECTION_DUMPSYS, (section).type = SECTION_DUMPSYS,