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

Commit 1147c7ff authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "graph_ams" into main 

* changes:
  Add ability to write process graph as json.
  Add tool to graph AMS process dependencies.
  Create python protos library build targets.
  activitymanagerservice.proto: Add client pid to ConnectionRecordProto.
parents d6b5b5cf 100980fa

core/proto/Android.bp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



python_library_host {

    name: "core-python-protos",

    proto: {

        include_dirs: ["external/protobuf/src"],

        canonical_path_from_root: true,

    },

    srcs: ["android/**/*.proto"],

    libs: [

        "framework-python-protos",

        "frameworks_proto_logging_protos_python",

    ],

}

core/proto/android/server/activitymanagerservice.proto

+2 −0
Original line number Diff line number Diff line
@@ -552,6 +552,8 @@ message ConnectionRecordProto { 
    }

    repeated Flag flags = 3;

    optional string service_name = 4;



    optional int32 client_pid = 5;

}



message AppBindRecordProto {

proto/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -52,3 +52,11 @@ filegroup { 
    name: "ipconnectivity-proto-src",

    srcs: ["src/ipconnectivity.proto"],

}



python_library_host {

    name: "framework-python-protos",

    proto: {

        canonical_path_from_root: false,

    },

    srcs: ["src/**/*.proto"],

}

services/core/java/com/android/server/am/ConnectionRecord.java

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ final class ConnectionRecord implements OomAdjusterImpl.Connection{ 
                Integer.toHexString(System.identityHashCode(this)));

        if (binding.client != null) {

            proto.write(ConnectionRecordProto.USER_ID, binding.client.userId);

            proto.write(ConnectionRecordProto.CLIENT_PID, binding.client.mPid);

        }

        ProtoUtils.writeBitWiseFlagsToProtoEnum(proto, ConnectionRecordProto.FLAGS,

                flags, BIND_ORIG_ENUMS, BIND_PROTO_ENUMS);

tools/graph_ams/Android.bp

0 → 100644
+28 −0
Original line number Diff line number Diff line 
// Copyright (C) 2025 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



python_binary_host {

    name: "graph_ams",

    srcs: ["graph_ams.py"],

    libs: ["core-python-protos"],

}