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

Commit 3105cca0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 98ea1340 am: b939c560

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1373460

Change-Id: Id3fd33f2d61182ab18e87d80f0adabca855ffb80
parents e416ab79 b939c560

libcutils/ashmem-dev.cpp

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ static bool check_vendor_memfd_allowed() { 
        return true;

    }



    /* If its not a number, assume string, but check if its a sane string */

    // Non-numeric should be a single ASCII character. Characters after the

    // first are ignored.

    if (tolower(vndk_version[0]) < 'a' || tolower(vndk_version[0]) > 'z') {

        ALOGE("memfd: ro.vndk.version not defined or invalid (%s), this is mandated since P.\n",

              vndk_version.c_str());

libcutils/qtaguid.cpp

+5 −5
Original line number Diff line number Diff line
@@ -38,24 +38,24 @@ class netdHandler { 
    int (*netdDeleteTagData)(uint32_t, uid_t);

};



int dummyTagSocket(int, uint32_t, uid_t) {

int stubTagSocket(int, uint32_t, uid_t) {

    return -EREMOTEIO;

}



int dummyUntagSocket(int) {

int stubUntagSocket(int) {

    return -EREMOTEIO;

}



int dummySetCounterSet(uint32_t, uid_t) {

int stubSetCounterSet(uint32_t, uid_t) {

    return -EREMOTEIO;

}



int dummyDeleteTagData(uint32_t, uid_t) {

int stubDeleteTagData(uint32_t, uid_t) {

    return -EREMOTEIO;

}



netdHandler initHandler(void) {

    netdHandler handler = {dummyTagSocket, dummyUntagSocket, dummySetCounterSet, dummyDeleteTagData};

    netdHandler handler = {stubTagSocket, stubUntagSocket, stubSetCounterSet, stubDeleteTagData};



    void* netdClientHandle = dlopen("libnetd_client.so", RTLD_NOW);

    if (!netdClientHandle) {

libutils/Unicode.cpp

+2 −2
Original line number Diff line number Diff line
@@ -162,9 +162,9 @@ int32_t utf32_from_utf8_at(const char *src, size_t src_len, size_t index, size_t 
    if (index >= src_len) {

        return -1;

    }

    size_t dummy_index;

    size_t unused_index;

    if (next_index == nullptr) {

        next_index = &dummy_index;

        next_index = &unused_index;

    }

    size_t num_read;

    int32_t ret = utf32_at_internal(src + index, &num_read);

libutils/include/utils/Vector.h

+3 −5
Original line number Diff line number Diff line
@@ -23,15 +23,13 @@ 
#include <log/log.h>

#include <utils/TypeHelpers.h>

#include <utils/VectorImpl.h>



/*

 * Used to blacklist some functions from CFI.

 *

 */

#ifndef __has_attribute

#define __has_attribute(x) 0

#endif



/*

 * Used to exclude some functions from CFI.

 */

#if __has_attribute(no_sanitize)

#define UTILS_VECTOR_NO_CFI __attribute__((no_sanitize("cfi")))

#else