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

Commit 836a7bd2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-a4f311f4-769c-4b62-a9ec-97e027ca869d-for-git_oc-dr1-release-39... 

release-request-a4f311f4-769c-4b62-a9ec-97e027ca869d-for-git_oc-dr1-release-3973849 snap-temp-L88500000060454810

Change-Id: I1ef3947d26403f1bd22c8555c82e490a37f73a67
parents 5b4019e3 72b06f10

cmds/atrace/atrace.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ int main(int argc, char **argv) 


    if (ok && traceStart) {

        if (!traceStream) {

            printf("capturing trace...\n");

            printf("capturing trace...");

            fflush(stdout);

        }

cmds/installd/utils.cpp

+8 −7
Original line number Diff line number Diff line
@@ -168,18 +168,19 @@ std::string create_data_app_path(const char* volume_uuid) { 


/**

 * Create the path name for user data for a certain userid.

 * Keep same implementation as vold to minimize path walking overhead

 */

std::string create_data_user_ce_path(const char* volume_uuid, userid_t userid) {

    std::string data(create_data_path(volume_uuid));

    if (volume_uuid == nullptr) {

        if (userid == 0) {

            return StringPrintf("%s/data", data.c_str());

        } else {

            return StringPrintf("%s/user/%u", data.c_str(), userid);

    if (volume_uuid == nullptr && userid == 0) {

        std::string legacy = StringPrintf("%s/data", data.c_str());

        struct stat sb;

        if (lstat(legacy.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode)) {

            /* /data/data is dir, return /data/data for legacy system */

            return legacy;

        }

    } else {

        return StringPrintf("%s/user/%u", data.c_str(), userid);

    }

    return StringPrintf("%s/user/%u", data.c_str(), userid);

}



/**

cmds/lshal/Lshal.cpp

+11 −3
Original line number Diff line number Diff line
@@ -322,8 +322,10 @@ void Lshal::dumpVintf() const { 
                    break;

                }

                if (hal->hasVersion(version)) {

                    if (&table != &mImplementationsTable) {

                        hal->interfaces[interfaceName].name = interfaceName;

                        hal->interfaces[interfaceName].instances.insert(instanceName);

                    }

                    done = true;

                    break;

                }
@@ -331,12 +333,17 @@ void Lshal::dumpVintf() const { 
            if (done) {

                continue; // to next TableEntry

            }

            decltype(vintf::ManifestHal::interfaces) interfaces;

            if (&table != &mImplementationsTable) {

                interfaces[interfaceName].name = interfaceName;

                interfaces[interfaceName].instances.insert(instanceName);

            }

            if (!manifest.add(vintf::ManifestHal{

                    .format = vintf::HalFormat::HIDL,

                    .name = fqName.package(),

                    .versions = {version},

                    .transportArch = {transport, arch},

                    .interfaces = {{interfaceName, {interfaceName, {{instanceName}}}}}})) {

                    .interfaces = interfaces})) {

                mErr << "Warning: cannot add hal '" << fqInstanceName << "'" << std::endl;

            }

        }
@@ -685,6 +692,7 @@ void Lshal::usage() const { 
        << "           -c, --clients: print the client PIDs, or client cmdlines if -m is set"

                                                                              << std::endl

        << "           -m, --cmdline: print cmdline instead of PIDs" << std::endl

        << "           -d, --debug: emit debug info from IBase::debug" << std::endl

        << "           --sort=i, --sort=interface: sort by interface name" << std::endl

        << "           --sort=p, --sort=pid: sort by server pid" << std::endl

        << "           --init-vintf=path: form a skeleton HAL manifest to specified file " << std::endl

cmds/servicemanager/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ cc_binary { 
    cflags: [

        "-DVENDORSERVICEMANAGER=1",

    ],

    shared_libs: ["libcutils"],

    static_libs: ["libselinux_vendor"],

    shared_libs: ["libcutils", "libselinux_vendor"],

    init_rc: ["vndservicemanager.rc"],

}

services/sensorservice/SensorService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ int SensorService::setOperationParameter( 
    for (sensors_event_t* i = event; i < event + 3; i++) {

        *i = (sensors_event_t) {

            .version = sizeof(sensors_event_t),

            .sensor = 0,

            .sensor = SENSORS_HANDLE_BASE - 1, // sensor that never exists

            .type = SENSOR_TYPE_ADDITIONAL_INFO,

            .timestamp = timestamp++,

            .additional_info = (additional_info_event_t) {