Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d01f32e authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove framework-connectivity-proto from platform" am: 90a441ea am: ff4a9295 

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



Change-Id: I98bca4cb7153ccb0220b14757e1842ba0ecd8874
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34b40ae5 ff4a9295

ProtoLibraries.bp

+0 −6
Original line number Diff line number Diff line
@@ -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",

core/proto/android/os/incident.proto

+1 −6
Original line number Diff line number Diff line
@@ -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,