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

Commit 6ccc9697 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7168754 from e28d8aba to sc-release 

Change-Id: I65236bdbf4dc5cd4afb4e03a7e087f4e030364ef
parents 6676f3ca e28d8aba

aidl/gui/android/hardware/display/IDeviceProductInfoConstants.aidl

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright 2021 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 android.hardware.display;



/** @hide */

interface IDeviceProductInfoConstants {

    /** The device connection to the display sink is unknown. */

    const int CONNECTION_TO_SINK_UNKNOWN = 0;



    /** The device is built-in in the display sink. */

    const int CONNECTION_TO_SINK_BUILT_IN = 1;



    /** The device is directly connected to the display sink. */

    const int CONNECTION_TO_SINK_DIRECT = 2;



    /** The device is transitively connected to the display sink. */

    const int CONNECTION_TO_SINK_TRANSITIVE = 3;

}
 
 No newline at end of file

cmds/atrace/atrace.rc

+16 −0
Original line number Diff line number Diff line
@@ -37,12 +37,18 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/sched/sched_process_exit/enable

    chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_waking/enable

    chmod 0666 /sys/kernel/tracing/events/sched/sched_waking/enable

    chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_wakeup_new/enable

    chmod 0666 /sys/kernel/tracing/events/sched/sched_wakeup_new/enable

    chmod 0666 /sys/kernel/debug/tracing/events/cgroup/enable

    chmod 0666 /sys/kernel/tracing/events/cgroup/enable

    chmod 0666 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable

    chmod 0666 /sys/kernel/tracing/events/power/cpu_frequency/enable

    chmod 0666 /sys/kernel/debug/tracing/events/power/cpu_idle/enable

    chmod 0666 /sys/kernel/tracing/events/power/cpu_idle/enable

    chmod 0666 /sys/kernel/debug/tracing/events/power/clock_enable/enable

    chmod 0666 /sys/kernel/tracing/events/power/clock_enable/enable

    chmod 0666 /sys/kernel/debug/tracing/events/power/clock_disable/enable

    chmod 0666 /sys/kernel/tracing/events/power/clock_disable/enable

    chmod 0666 /sys/kernel/debug/tracing/events/power/clock_set_rate/enable

    chmod 0666 /sys/kernel/tracing/events/power/clock_set_rate/enable

    chmod 0666 /sys/kernel/debug/tracing/events/power/cpu_frequency_limits/enable
@@ -79,6 +85,8 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/binder/binder_locked/enable

    chmod 0666 /sys/kernel/debug/tracing/events/binder/binder_unlock/enable

    chmod 0666 /sys/kernel/tracing/events/binder/binder_unlock/enable

    chmod 0666 /sys/kernel/debug/tracing/events/binder/binder_set_priority/enable

    chmod 0666 /sys/kernel/tracing/events/binder/binder_set_priority/enable

    chmod 0666 /sys/kernel/debug/tracing/events/i2c/enable

    chmod 0666 /sys/kernel/tracing/events/i2c/enable

    chmod 0666 /sys/kernel/debug/tracing/events/i2c/i2c_read/enable
@@ -125,6 +133,8 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/lowmemorykiller/lowmemory_kill/enable

    chmod 0666 /sys/kernel/debug/tracing/events/oom/oom_score_adj_update/enable

    chmod 0666 /sys/kernel/tracing/events/oom/oom_score_adj_update/enable

    chmod 0666 /sys/kernel/debug/tracing/events/oom/mark_victim/enable

    chmod 0666 /sys/kernel/tracing/events/oom/mark_victim/enable

    chmod 0666 /sys/kernel/debug/tracing/events/task/task_rename/enable

    chmod 0666 /sys/kernel/tracing/events/task/task_rename/enable

    chmod 0666 /sys/kernel/debug/tracing/events/task/task_newtask/enable
@@ -159,6 +169,12 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/ipi/ipi_exit/enable

    chmod 0666 /sys/kernel/debug/tracing/events/ipi/ipi_raise/enable

    chmod 0666 /sys/kernel/tracing/events/ipi/ipi_raise/enable

    chmod 0666 /sys/kernel/debug/tracing/events/clk/clk_enable/enable

    chmod 0666 /sys/kernel/tracing/events/clk/clk_disable/enable

    chmod 0666 /sys/kernel/debug/tracing/events/clk/clk_disable/enable

    chmod 0666 /sys/kernel/tracing/events/clk/clk_enable/enable

    chmod 0666 /sys/kernel/debug/tracing/events/clk/clk_set_rate/enable

    chmod 0666 /sys/kernel/tracing/events/clk/clk_set_rate/enable



    # disk

    chmod 0666 /sys/kernel/tracing/events/f2fs/f2fs_get_data_block/enable

cmds/atrace/atrace_userdebug.rc

+0 −5
Original line number Diff line number Diff line
@@ -18,8 +18,3 @@ on post-fs 
    chmod 0666 /sys/kernel/tracing/events/filemap/enable

    chmod 0666 /sys/kernel/debug/tracing/events/filemap/enable

    # irq

    chmod 0666 /sys/kernel/tracing/events/irq/enable

    chmod 0666 /sys/kernel/debug/tracing/events/irq/enable

    chmod 0666 /sys/kernel/tracing/events/ipi/enable

    chmod 0666 /sys/kernel/debug/tracing/events/ipi/enable

cmds/idlcli/CommandVibrator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ namespace idlcli { 
class IdlCli;



class CommandVibrator : public CommandWithSubcommands<CommandVibrator> {

    std::string getDescription() const override { return "Invoke Vibrator HIDL APIs."; }

    std::string getDescription() const override { return "Invoke Vibrator IDL APIs."; }



    std::string getUsageSummary() const override { return "<api> [arguments]"; }

cmds/idlcli/IdlCli.h

+34 −1
Original line number Diff line number Diff line
@@ -25,14 +25,47 @@ namespace idlcli { 
class IdlCli : public CommandWithSubcommands<IdlCli> {

    std::string getDescription() const override { return "Invoke IDL APIs."; }



    std::string getUsageSummary() const override { return "<idl> [arguments]"; }

    std::string getUsageSummary() const override { return "<idl> [options] [arguments]"; }



    UsageDetails getUsageDetails() const override {

        UsageDetails details{

                {"-n <name>", {"Get named service, rather than default."}},

                {"<idl>", CommandRegistry<IdlCli>::List()},

        };

        return details;

    }



    Status doArgs(Args &args) override {

        while (args.get<std::string>().value_or("").find("-") == 0) {

            auto opt = *args.pop<std::string>();

            if (opt == "--") {

                break;

            } else if (opt == "-n") {

                if (auto name = args.pop<decltype(mName)>()) {

                    mName = *name;

                } else {

                    std::cerr << "Missing Value for Name!" << std::endl;

                    return USAGE;

                }

            } else {

                std::cerr << "Invalid Option '" << opt << "'!" << std::endl;

                return USAGE;

            }

        }

        return CommandWithSubcommands::doArgs(args);

    }



    IdlCli() {}



    std::string mName;



public:

    static IdlCli &Get() {

        static IdlCli instance;

        return instance;

    }



    auto getName() { return mName; }

};



} // namespace idlcli