diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-21 16:14:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-10-21 16:14:56 +0000 |
| commit | 70f183378c3a9b37e4bb76f748882dbcaeb19fe4 (patch) | |
| tree | ebc6018be4215eda8080dd66b071f35fdf49e8d0 | |
| parent | 7420e65f177b4a9530d4c57a3aeede3e82d6f3fe (diff) | |
| parent | 5bf3ee590a2808b9144f445a6d41304b00b830fa (diff) | |
| download | base-gki13-boot-release.tar.gz | |
Merge "Snap for 9204358 from 17da6cad863a83b0579bce1cf8388c6e096bd2b2 to gki13-boot-release" into gki13-boot-releasegki13-boot-release
| -rw-r--r-- | ProtoLibraries.bp | 6 | ||||
| -rw-r--r-- | core/java/android/os/storage/OWNERS | 16 | ||||
| -rw-r--r-- | core/proto/android/os/incident.proto | 7 |
3 files changed, 11 insertions, 18 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/java/android/os/storage/OWNERS b/core/java/android/os/storage/OWNERS index 1f686e5c449c..c80c57ce917a 100644 --- a/core/java/android/os/storage/OWNERS +++ b/core/java/android/os/storage/OWNERS @@ -1,11 +1,15 @@ # Bug component: 95221 +# Android Storage Team +abkaur@google.com corinac@google.com -nandana@google.com -zezeozue@google.com -maco@google.com +dipankarb@google.com +krishang@google.com sahanas@google.com -abkaur@google.com -chiangi@google.com +sergeynv@google.com +shubhisaxena@google.com +tylersaunders@google.com + +maco@google.com +nandana@google.com narayan@google.com -dipankarb@google.com 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, |