From 93239bf038f8b662dfa97e841803fca7928dcd5a Mon Sep 17 00:00:00 2001
From: Aaron Huang <huangaaron@google.com>
Date: Mon, 11 Apr 2022 17:19:37 +0800
Subject: [PATCH] Remove framework-connectivity-proto from platform

In the generated javastream and cppsteam incident proto file,
it defines the start position for netstats at 3001 and it doesn't
actually use the NetworkStatsServiceDumpProto which is deinfed in
netstats.proto.
Thus, the framework-connectivity-proto can be removed from
framework-javastream-protos and framework-cppstream-protos.

The generated incident proto file defines netstats as the following,

    // optional .android.service.NetworkStatsServiceDumpProto netstats = 3001;
    public static final long NETSTATS = 0x0000010b00000bb9L;

Furthermore, on Android side, this is not strictly proto dependency,
and there's no one using this section, so it can be removed and mark
it as reserved.

Bug: 222625935
Test: FrameworksNetTests
      atest CtsIncidentHostTestCases:IncidentdTest
      adb shell dumpsys netstats
Change-Id: I3083a43a2f9c20768264ce2a531e0a0593f31697
---
 ProtoLibraries.bp                    | 6 ------
 core/proto/android/os/incident.proto | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/ProtoLibraries.bp b/ProtoLibraries.bp
index 67acfad3bfdd0..c12f5b4395ec0 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 57026d95ceb81..4bbfee2f93cd6 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,