diff options
| author | 2022-10-21 21:21:40 +0000 | |
|---|---|---|
| committer | 2022-10-21 21:21:40 +0000 | |
| commit | 4d01f32ef9b04ee889f33ef36b9a2ad41da1a9ea (patch) | |
| tree | 17fa7e375d244e778bcef913d969df31e993462d | |
| parent | 34b40ae5574aaffb58ae2930eb73650217d78b63 (diff) | |
| parent | ff4a929538ab2d128704ef019ad0d0c68f98e3a5 (diff) | |
Merge "Remove framework-connectivity-proto from platform" am: 90a441ea64 am: ff4a929538
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>
| -rw-r--r-- | ProtoLibraries.bp | 6 | ||||
| -rw-r--r-- | core/proto/android/os/incident.proto | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/ProtoLibraries.bp b/ProtoLibraries.bp index 67acfad3bfdd..c12f5b4395ec 100644 --- a/ProtoLibraries.bp +++ b/ProtoLibraries.bp @@ -35,7 +35,6 @@ gensrcs { "&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)", srcs: [ - ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -68,7 +67,6 @@ gensrcs { " $(in)", srcs: [ - ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -84,7 +82,6 @@ gensrcs { java_library_host { name: "platformprotos", srcs: [ - ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -124,7 +121,6 @@ java_library { ], sdk_version: "9", srcs: [ - ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -147,7 +143,6 @@ java_library { }, srcs: [ - ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", @@ -185,7 +180,6 @@ cc_defaults { ], srcs: [ - ":framework-connectivity-protos", ":ipconnectivity-proto-src", ":libstats_atom_enum_protos", ":libstats_atom_message_protos", diff --git a/core/proto/android/os/incident.proto b/core/proto/android/os/incident.proto index 57026d95ceb8..4bbfee2f93cd 100644 --- a/core/proto/android/os/incident.proto +++ b/core/proto/android/os/incident.proto @@ -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/section.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"; package android.os; @@ -247,11 +246,7 @@ message IncidentProto { (section).args = "fingerprint --proto --incident" ]; - optional android.service.NetworkStatsServiceDumpProto netstats = 3001 [ - (section).type = SECTION_DUMPSYS, - (section).args = "netstats --proto", - (section).userdebug_and_eng_only = true - ]; + reserved 3001; optional android.providers.settings.SettingsServiceDumpProto settings = 3002 [ (section).type = SECTION_DUMPSYS, |