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

Commit b96814d9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8046958 from 440d73e0 to tm-release 

Change-Id: I6350ab3f5f00def3703adea5591f812a0af16e90
parents 2816f79b 440d73e0

cmds/atrace/atrace.rc

+280 −0
Original line number Diff line number Diff line
@@ -11,6 +11,286 @@ on late-init 


# Grant unix world read/write permissions to kernel tracepoints.

# Access control to these files is now entirely in selinux policy.

    chmod 0755 /sys/kernel/debug/tracing/events

    chmod 0755 /sys/kernel/debug/tracing/events/binder

    chmod 0755 /sys/kernel/debug/tracing/events/binder/binder_lock

    chmod 0755 /sys/kernel/debug/tracing/events/binder/binder_locked

    chmod 0755 /sys/kernel/debug/tracing/events/binder/binder_set_priority

    chmod 0755 /sys/kernel/debug/tracing/events/binder/binder_transaction

    chmod 0755 /sys/kernel/debug/tracing/events/binder/binder_transaction_alloc_buf

    chmod 0755 /sys/kernel/debug/tracing/events/binder/binder_transaction_received

    chmod 0755 /sys/kernel/debug/tracing/events/binder/binder_unlock

    chmod 0755 /sys/kernel/debug/tracing/events/block

    chmod 0755 /sys/kernel/debug/tracing/events/block/block_rq_complete

    chmod 0755 /sys/kernel/debug/tracing/events/block/block_rq_issue

    chmod 0755 /sys/kernel/debug/tracing/events/cgroup

    chmod 0755 /sys/kernel/debug/tracing/events/clk

    chmod 0755 /sys/kernel/debug/tracing/events/clk/clk_disable

    chmod 0755 /sys/kernel/debug/tracing/events/clk/clk_enable

    chmod 0755 /sys/kernel/debug/tracing/events/clk/clk_set_rate

    chmod 0755 /sys/kernel/debug/tracing/events/cpufreq_interactive

    chmod 0755 /sys/kernel/debug/tracing/events/cpuhp

    chmod 0755 /sys/kernel/debug/tracing/events/cpuhp/cpuhp_enter

    chmod 0755 /sys/kernel/debug/tracing/events/cpuhp/cpuhp_exit

    chmod 0755 /sys/kernel/debug/tracing/events/cpuhp/cpuhp_pause

    chmod 0755 /sys/kernel/debug/tracing/events/dma_fence

    chmod 0755 /sys/kernel/debug/tracing/events/ext4

    chmod 0755 /sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin

    chmod 0755 /sys/kernel/debug/tracing/events/ext4/ext4_da_write_end

    chmod 0755 /sys/kernel/debug/tracing/events/ext4/ext4_es_lookup_extent_enter

    chmod 0755 /sys/kernel/debug/tracing/events/ext4/ext4_es_lookup_extent_exit

    chmod 0755 /sys/kernel/debug/tracing/events/ext4/ext4_load_inode

    chmod 0755 /sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter

    chmod 0755 /sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit

    chmod 0755 /sys/kernel/debug/tracing/events/f2fs

    chmod 0755 /sys/kernel/debug/tracing/events/f2fs/f2fs_get_data_block

    chmod 0755 /sys/kernel/debug/tracing/events/f2fs/f2fs_iget

    chmod 0755 /sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter

    chmod 0755 /sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit

    chmod 0755 /sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin

    chmod 0755 /sys/kernel/debug/tracing/events/f2fs/f2fs_write_end

    chmod 0755 /sys/kernel/debug/tracing/events/fence

    chmod 0755 /sys/kernel/debug/tracing/events/filemap

    chmod 0755 /sys/kernel/debug/tracing/events/filemap/mm_filemap_add_to_page_cache

    chmod 0755 /sys/kernel/debug/tracing/events/filemap/mm_filemap_delete_from_page_cache

    chmod 0755 /sys/kernel/debug/tracing/events/gpu_mem

    chmod 0755 /sys/kernel/debug/tracing/events/gpu_mem/gpu_mem_total

    chmod 0755 /sys/kernel/debug/tracing/events/i2c

    chmod 0755 /sys/kernel/debug/tracing/events/i2c/i2c_read

    chmod 0755 /sys/kernel/debug/tracing/events/i2c/i2c_reply

    chmod 0755 /sys/kernel/debug/tracing/events/i2c/i2c_result

    chmod 0755 /sys/kernel/debug/tracing/events/i2c/i2c_write

    chmod 0755 /sys/kernel/debug/tracing/events/i2c/smbus_read

    chmod 0755 /sys/kernel/debug/tracing/events/i2c/smbus_reply

    chmod 0755 /sys/kernel/debug/tracing/events/i2c/smbus_result

    chmod 0755 /sys/kernel/debug/tracing/events/i2c/smbus_write

    chmod 0755 /sys/kernel/debug/tracing/events/ion

    chmod 0755 /sys/kernel/debug/tracing/events/ion/ion_stat

    chmod 0755 /sys/kernel/debug/tracing/events/ipi

    chmod 0755 /sys/kernel/debug/tracing/events/ipi/ipi_entry

    chmod 0755 /sys/kernel/debug/tracing/events/ipi/ipi_exit

    chmod 0755 /sys/kernel/debug/tracing/events/ipi/ipi_raise

    chmod 0755 /sys/kernel/debug/tracing/events/irq

    chmod 0755 /sys/kernel/debug/tracing/events/irq/irq_handler_entry

    chmod 0755 /sys/kernel/debug/tracing/events/irq/irq_handler_exit

    chmod 0755 /sys/kernel/debug/tracing/events/irq/softirq_entry

    chmod 0755 /sys/kernel/debug/tracing/events/irq/softirq_exit

    chmod 0755 /sys/kernel/debug/tracing/events/irq/softirq_raise

    chmod 0755 /sys/kernel/debug/tracing/events/irq/tasklet_entry

    chmod 0755 /sys/kernel/debug/tracing/events/irq/tasklet_exit

    chmod 0755 /sys/kernel/debug/tracing/events/irq/tasklet_hi_entry

    chmod 0755 /sys/kernel/debug/tracing/events/irq/tasklet_hi_exit

    chmod 0755 /sys/kernel/debug/tracing/events/kmem

    chmod 0755 /sys/kernel/debug/tracing/events/kmem/ion_heap_grow

    chmod 0755 /sys/kernel/debug/tracing/events/kmem/ion_heap_shrink

    chmod 0755 /sys/kernel/debug/tracing/events/kmem/rss_stat

    chmod 0755 /sys/kernel/debug/tracing/events/lowmemorykiller

    chmod 0755 /sys/kernel/debug/tracing/events/lowmemorykiller/lowmemory_kill

    chmod 0755 /sys/kernel/debug/tracing/events/mm_event

    chmod 0755 /sys/kernel/debug/tracing/events/mm_event/mm_event_record

    chmod 0755 /sys/kernel/debug/tracing/events/oom

    chmod 0755 /sys/kernel/debug/tracing/events/oom/mark_victim

    chmod 0755 /sys/kernel/debug/tracing/events/oom/oom_score_adj_update

    chmod 0755 /sys/kernel/debug/tracing/events/power

    chmod 0755 /sys/kernel/debug/tracing/events/power/clock_disable

    chmod 0755 /sys/kernel/debug/tracing/events/power/clock_enable

    chmod 0755 /sys/kernel/debug/tracing/events/power/clock_set_rate

    chmod 0755 /sys/kernel/debug/tracing/events/power/cpu_frequency

    chmod 0755 /sys/kernel/debug/tracing/events/power/cpu_frequency_limits

    chmod 0755 /sys/kernel/debug/tracing/events/power/cpu_idle

    chmod 0755 /sys/kernel/debug/tracing/events/power/gpu_frequency

    chmod 0755 /sys/kernel/debug/tracing/events/power/suspend_resume

    chmod 0755 /sys/kernel/debug/tracing/events/sched

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_blocked_reason

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_cpu_hotplug

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_pi_setprio

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_process_exit

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_process_free

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_switch

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_wakeup

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_wakeup_new

    chmod 0755 /sys/kernel/debug/tracing/events/sched/sched_waking

    chmod 0755 /sys/kernel/debug/tracing/events/signal

    chmod 0755 /sys/kernel/debug/tracing/events/signal/signal_deliver

    chmod 0755 /sys/kernel/debug/tracing/events/signal/signal_generate

    chmod 0755 /sys/kernel/debug/tracing/events/sync

    chmod 0755 /sys/kernel/debug/tracing/events/task

    chmod 0755 /sys/kernel/debug/tracing/events/task/task_newtask

    chmod 0755 /sys/kernel/debug/tracing/events/task/task_rename

    chmod 0755 /sys/kernel/debug/tracing/events/thermal

    chmod 0755 /sys/kernel/debug/tracing/events/thermal/cdev_update

    chmod 0755 /sys/kernel/debug/tracing/events/thermal/thermal_temperature

    chmod 0755 /sys/kernel/debug/tracing/events/vmscan

    chmod 0755 /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_direct_reclaim_begin

    chmod 0755 /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_direct_reclaim_end

    chmod 0755 /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_sleep

    chmod 0755 /sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_wake

    chmod 0755 /sys/kernel/debug/tracing/options

    chmod 0755 /sys/kernel/debug/tracing/per_cpu

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu0

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu1

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu2

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu3

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu4

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu5

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu6

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu7

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu8

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu9

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu10

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu11

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu12

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu13

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu14

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu15

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu16

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu17

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu18

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu19

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu20

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu21

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu22

    chmod 0755 /sys/kernel/debug/tracing/per_cpu/cpu23

    chmod 0755 /sys/kernel/tracing/events

    chmod 0755 /sys/kernel/tracing/events/binder

    chmod 0755 /sys/kernel/tracing/events/binder/binder_lock

    chmod 0755 /sys/kernel/tracing/events/binder/binder_locked

    chmod 0755 /sys/kernel/tracing/events/binder/binder_set_priority

    chmod 0755 /sys/kernel/tracing/events/binder/binder_transaction

    chmod 0755 /sys/kernel/tracing/events/binder/binder_transaction_alloc_buf

    chmod 0755 /sys/kernel/tracing/events/binder/binder_transaction_received

    chmod 0755 /sys/kernel/tracing/events/binder/binder_unlock

    chmod 0755 /sys/kernel/tracing/events/block

    chmod 0755 /sys/kernel/tracing/events/block/block_rq_complete

    chmod 0755 /sys/kernel/tracing/events/block/block_rq_issue

    chmod 0755 /sys/kernel/tracing/events/cgroup

    chmod 0755 /sys/kernel/tracing/events/clk

    chmod 0755 /sys/kernel/tracing/events/clk/clk_disable

    chmod 0755 /sys/kernel/tracing/events/clk/clk_enable

    chmod 0755 /sys/kernel/tracing/events/clk/clk_set_rate

    chmod 0755 /sys/kernel/tracing/events/cpufreq_interactive

    chmod 0755 /sys/kernel/tracing/events/cpuhp

    chmod 0755 /sys/kernel/tracing/events/cpuhp/cpuhp_enter

    chmod 0755 /sys/kernel/tracing/events/cpuhp/cpuhp_exit

    chmod 0755 /sys/kernel/tracing/events/cpuhp/cpuhp_pause

    chmod 0755 /sys/kernel/tracing/events/dma_fence

    chmod 0755 /sys/kernel/tracing/events/ext4

    chmod 0755 /sys/kernel/tracing/events/ext4/ext4_da_write_begin

    chmod 0755 /sys/kernel/tracing/events/ext4/ext4_da_write_end

    chmod 0755 /sys/kernel/tracing/events/ext4/ext4_es_lookup_extent_enter

    chmod 0755 /sys/kernel/tracing/events/ext4/ext4_es_lookup_extent_exit

    chmod 0755 /sys/kernel/tracing/events/ext4/ext4_load_inode

    chmod 0755 /sys/kernel/tracing/events/ext4/ext4_sync_file_enter

    chmod 0755 /sys/kernel/tracing/events/ext4/ext4_sync_file_exit

    chmod 0755 /sys/kernel/tracing/events/f2fs

    chmod 0755 /sys/kernel/tracing/events/f2fs/f2fs_get_data_block

    chmod 0755 /sys/kernel/tracing/events/f2fs/f2fs_iget

    chmod 0755 /sys/kernel/tracing/events/f2fs/f2fs_sync_file_enter

    chmod 0755 /sys/kernel/tracing/events/f2fs/f2fs_sync_file_exit

    chmod 0755 /sys/kernel/tracing/events/f2fs/f2fs_write_begin

    chmod 0755 /sys/kernel/tracing/events/f2fs/f2fs_write_end

    chmod 0755 /sys/kernel/tracing/events/fence

    chmod 0755 /sys/kernel/tracing/events/filemap

    chmod 0755 /sys/kernel/tracing/events/filemap/mm_filemap_add_to_page_cache

    chmod 0755 /sys/kernel/tracing/events/filemap/mm_filemap_delete_from_page_cache

    chmod 0755 /sys/kernel/tracing/events/gpu_mem

    chmod 0755 /sys/kernel/tracing/events/gpu_mem/gpu_mem_total

    chmod 0755 /sys/kernel/tracing/events/i2c

    chmod 0755 /sys/kernel/tracing/events/i2c/i2c_read

    chmod 0755 /sys/kernel/tracing/events/i2c/i2c_reply

    chmod 0755 /sys/kernel/tracing/events/i2c/i2c_result

    chmod 0755 /sys/kernel/tracing/events/i2c/i2c_write

    chmod 0755 /sys/kernel/tracing/events/i2c/smbus_read

    chmod 0755 /sys/kernel/tracing/events/i2c/smbus_reply

    chmod 0755 /sys/kernel/tracing/events/i2c/smbus_result

    chmod 0755 /sys/kernel/tracing/events/i2c/smbus_write

    chmod 0755 /sys/kernel/tracing/events/ion

    chmod 0755 /sys/kernel/tracing/events/ion/ion_stat

    chmod 0755 /sys/kernel/tracing/events/ipi

    chmod 0755 /sys/kernel/tracing/events/ipi/ipi_entry

    chmod 0755 /sys/kernel/tracing/events/ipi/ipi_exit

    chmod 0755 /sys/kernel/tracing/events/ipi/ipi_raise

    chmod 0755 /sys/kernel/tracing/events/irq

    chmod 0755 /sys/kernel/tracing/events/irq/irq_handler_entry

    chmod 0755 /sys/kernel/tracing/events/irq/irq_handler_exit

    chmod 0755 /sys/kernel/tracing/events/irq/softirq_entry

    chmod 0755 /sys/kernel/tracing/events/irq/softirq_exit

    chmod 0755 /sys/kernel/tracing/events/irq/softirq_raise

    chmod 0755 /sys/kernel/tracing/events/irq/tasklet_entry

    chmod 0755 /sys/kernel/tracing/events/irq/tasklet_exit

    chmod 0755 /sys/kernel/tracing/events/irq/tasklet_hi_entry

    chmod 0755 /sys/kernel/tracing/events/irq/tasklet_hi_exit

    chmod 0755 /sys/kernel/tracing/events/kmem

    chmod 0755 /sys/kernel/tracing/events/kmem/ion_heap_grow

    chmod 0755 /sys/kernel/tracing/events/kmem/ion_heap_shrink

    chmod 0755 /sys/kernel/tracing/events/kmem/rss_stat

    chmod 0755 /sys/kernel/tracing/events/lowmemorykiller

    chmod 0755 /sys/kernel/tracing/events/lowmemorykiller/lowmemory_kill

    chmod 0755 /sys/kernel/tracing/events/mm_event

    chmod 0755 /sys/kernel/tracing/events/mm_event/mm_event_record

    chmod 0755 /sys/kernel/tracing/events/oom

    chmod 0755 /sys/kernel/tracing/events/oom/mark_victim

    chmod 0755 /sys/kernel/tracing/events/oom/oom_score_adj_update

    chmod 0755 /sys/kernel/tracing/events/power

    chmod 0755 /sys/kernel/tracing/events/power/clock_disable

    chmod 0755 /sys/kernel/tracing/events/power/clock_enable

    chmod 0755 /sys/kernel/tracing/events/power/clock_set_rate

    chmod 0755 /sys/kernel/tracing/events/power/cpu_frequency

    chmod 0755 /sys/kernel/tracing/events/power/cpu_frequency_limits

    chmod 0755 /sys/kernel/tracing/events/power/cpu_idle

    chmod 0755 /sys/kernel/tracing/events/power/gpu_frequency

    chmod 0755 /sys/kernel/tracing/events/power/suspend_resume

    chmod 0755 /sys/kernel/tracing/events/sched

    chmod 0755 /sys/kernel/tracing/events/sched/sched_blocked_reason

    chmod 0755 /sys/kernel/tracing/events/sched/sched_cpu_hotplug

    chmod 0755 /sys/kernel/tracing/events/sched/sched_pi_setprio

    chmod 0755 /sys/kernel/tracing/events/sched/sched_process_exit

    chmod 0755 /sys/kernel/tracing/events/sched/sched_process_free

    chmod 0755 /sys/kernel/tracing/events/sched/sched_switch

    chmod 0755 /sys/kernel/tracing/events/sched/sched_wakeup

    chmod 0755 /sys/kernel/tracing/events/sched/sched_wakeup_new

    chmod 0755 /sys/kernel/tracing/events/sched/sched_waking

    chmod 0755 /sys/kernel/tracing/events/signal

    chmod 0755 /sys/kernel/tracing/events/signal/signal_deliver

    chmod 0755 /sys/kernel/tracing/events/signal/signal_generate

    chmod 0755 /sys/kernel/tracing/events/sync

    chmod 0755 /sys/kernel/tracing/events/task

    chmod 0755 /sys/kernel/tracing/events/task/task_newtask

    chmod 0755 /sys/kernel/tracing/events/task/task_rename

    chmod 0755 /sys/kernel/tracing/events/thermal

    chmod 0755 /sys/kernel/tracing/events/thermal/cdev_update

    chmod 0755 /sys/kernel/tracing/events/thermal/thermal_temperature

    chmod 0755 /sys/kernel/tracing/events/vmscan

    chmod 0755 /sys/kernel/tracing/events/vmscan/mm_vmscan_direct_reclaim_begin

    chmod 0755 /sys/kernel/tracing/events/vmscan/mm_vmscan_direct_reclaim_end

    chmod 0755 /sys/kernel/tracing/events/vmscan/mm_vmscan_kswapd_sleep

    chmod 0755 /sys/kernel/tracing/events/vmscan/mm_vmscan_kswapd_wake

    chmod 0755 /sys/kernel/tracing/options

    chmod 0755 /sys/kernel/tracing/per_cpu

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu0

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu1

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu2

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu3

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu4

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu5

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu6

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu7

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu8

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu9

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu10

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu11

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu12

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu13

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu14

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu15

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu16

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu17

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu18

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu19

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu20

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu21

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu22

    chmod 0755 /sys/kernel/tracing/per_cpu/cpu23

    chmod 0666 /sys/kernel/debug/tracing/trace_clock

    chmod 0666 /sys/kernel/tracing/trace_clock

    chmod 0666 /sys/kernel/debug/tracing/buffer_size_kb

data/etc/android.hardware.type.automotive.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ 
<!-- These features determine that the device running android is a car. -->

<permissions>

    <feature name="android.hardware.type.automotive" />

    <!-- TODO: Revert this after enabling work profiles refer b/170332519 -->

    <unavailable-feature name="android.software.managed_users"/>

</permissions>

libs/binder/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ cc_library { 
    sanitize: {

        misc_undefined: ["integer"],

    },

    min_sdk_version: "30",



    tidy: true,

    tidy_flags: [
@@ -330,7 +329,6 @@ aidl_interface { 
cc_library {

    name: "libbinder_rpc_unstable",

    srcs: ["libbinder_rpc_unstable.cpp"],

    defaults: ["libbinder_ndk_host_user"],

    shared_libs: [

        "libbase",

        "libbinder",

libs/binder/RpcServer.cpp

+7 −6
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie 


    RpcConnectionHeader header;

    if (status == OK) {

        status = client->interruptableReadFully(server->mShutdownTrigger.get(), &header,

                                                sizeof(header), {});

        iovec iov{&header, sizeof(header)};

        status = client->interruptableReadFully(server->mShutdownTrigger.get(), &iov, 1, {});

        if (status != OK) {

            ALOGE("Failed to read ID for client connecting to RPC server: %s",

                  statusToString(status).c_str());
@@ -301,8 +301,9 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie 
        if (header.sessionIdSize > 0) {

            if (header.sessionIdSize == kSessionIdBytes) {

                sessionId.resize(header.sessionIdSize);

                status = client->interruptableReadFully(server->mShutdownTrigger.get(),

                                                        sessionId.data(), sessionId.size(), {});

                iovec iov{sessionId.data(), sessionId.size()};

                status =

                        client->interruptableReadFully(server->mShutdownTrigger.get(), &iov, 1, {});

                if (status != OK) {

                    ALOGE("Failed to read session ID for client connecting to RPC server: %s",

                          statusToString(status).c_str());
@@ -331,8 +332,8 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie 
                    .version = protocolVersion,

            };



            status = client->interruptableWriteFully(server->mShutdownTrigger.get(), &response,

                                                     sizeof(response), {});

            iovec iov{&response, sizeof(response)};

            status = client->interruptableWriteFully(server->mShutdownTrigger.get(), &iov, 1, {});

            if (status != OK) {

                ALOGE("Failed to send new session response: %s", statusToString(status).c_str());

                // still need to cleanup before we can return

libs/binder/RpcSession.cpp

+5 −3
Original line number Diff line number Diff line
@@ -615,8 +615,9 @@ status_t RpcSession::initAndAddConnection(unique_fd fd, const std::vector<uint8_ 
        header.options |= RPC_CONNECTION_OPTION_INCOMING;

    }



    iovec headerIov{&header, sizeof(header)};

    auto sendHeaderStatus =

            server->interruptableWriteFully(mShutdownTrigger.get(), &header, sizeof(header), {});

            server->interruptableWriteFully(mShutdownTrigger.get(), &headerIov, 1, {});

    if (sendHeaderStatus != OK) {

        ALOGE("Could not write connection header to socket: %s",

              statusToString(sendHeaderStatus).c_str());
@@ -624,9 +625,10 @@ status_t RpcSession::initAndAddConnection(unique_fd fd, const std::vector<uint8_ 
    }



    if (sessionId.size() > 0) {

        iovec sessionIov{const_cast<void*>(static_cast<const void*>(sessionId.data())),

                         sessionId.size()};

        auto sendSessionIdStatus =

                server->interruptableWriteFully(mShutdownTrigger.get(), sessionId.data(),

                                                sessionId.size(), {});

                server->interruptableWriteFully(mShutdownTrigger.get(), &sessionIov, 1, {});

        if (sendSessionIdStatus != OK) {

            ALOGE("Could not write session ID ('%s') to socket: %s",

                  base::HexString(sessionId.data(), sessionId.size()).c_str(),