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

Commit 8a5c5275 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4686875 from 50c069e4 to pi-release 

Change-Id: I878a97a69c3205fd86ccc3b71f16db040f950cac
parents bd8c60ec 50c069e4

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -145,11 +145,11 @@ java_library { 
        ":libcamera_client_framework_aidl",

        "core/java/android/hardware/IConsumerIrService.aidl",

        "core/java/android/hardware/ISerialManager.aidl",

        "core/java/android/hardware/biometrics/IBiometricDialogReceiver.aidl",

        "core/java/android/hardware/display/IDisplayManager.aidl",

        "core/java/android/hardware/display/IDisplayManagerCallback.aidl",

        "core/java/android/hardware/display/IVirtualDisplayCallback.aidl",

        "core/java/android/hardware/fingerprint/IFingerprintClientActiveCallback.aidl",

        "core/java/android/hardware/fingerprint/IFingerprintDialogReceiver.aidl",

        "core/java/android/hardware/fingerprint/IFingerprintService.aidl",

        "core/java/android/hardware/fingerprint/IFingerprintServiceLockoutResetCallback.aidl",

        "core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl",

Android.mk

+19 −16
Original line number Diff line number Diff line
@@ -861,14 +861,11 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 


# ==== hiddenapi lists =======================================



# Copy blacklist and light greylist over into the build folder.

# Copy light and dark greylist over into the build folder.

# This is for ART buildbots which need to mock these lists and have alternative

# rules for building them. Other rules in the build system should depend on the

# files in the build folder.



$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-blacklist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)))



# Automatically add all methods which match the following signatures.

# These need to be greylisted in order to allow applications to write their

# own serializers.
@@ -891,25 +888,31 @@ $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): frameworks/base/config/hiddenapi- 
	     <(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" $(PRIVATE_API)) \

	> $@



$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-dark-greylist.txt,\

                            $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)))



# Generate dark greylist as private API minus (blacklist plus light greylist).



$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

                                              $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) \

                                              $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)

	if [ ! -z "`comm -12 <(sort $(BLACKLIST)) <(sort $(LIGHT_GREYLIST))`" ]; then \

		echo "There should be no overlap between $(BLACKLIST) and $(LIGHT_GREYLIST)" 1>&2; \

$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): PRIVATE_API := $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE)

$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)

$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST): $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \

                                          $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \

                                          $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)

	if [ ! -z "`comm -12 <(sort $(LIGHT_GREYLIST)) <(sort $(DARK_GREYLIST))`" ]; then \

		echo "There should be no overlap between $(LIGHT_GREYLIST) and $(DARK_GREYLIST)" 1>&2; \

		comm -12 <(sort $(LIGHT_GREYLIST)) <(sort $(DARK_GREYLIST)) 1>&2; \

		exit 1; \

	elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST))`" ]; then \

		echo "$(BLACKLIST) must be a subset of $(PRIVATE_API)" 1>&2; \

		exit 2; \

	elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST))`" ]; then \

		echo "$(LIGHT_GREYLIST) must be a subset of $(PRIVATE_API)" 1>&2; \

		comm -13 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST)) 1>&2; \

		exit 2; \

	elif [ ! -z "`comm -13 <(sort $(PRIVATE_API)) <(sort $(DARK_GREYLIST))`" ]; then \

		echo "$(DARK_GREYLIST) must be a subset of $(PRIVATE_API)" 1>&2; \

		comm -13 <(sort $(PRIVATE_API)) <(sort $(DARK_GREYLIST)) 1>&2; \

		exit 3; \

	fi

	comm -23 <(sort $(PRIVATE_API)) <(sort $(BLACKLIST) $(LIGHT_GREYLIST)) > $@

	comm -23 <(sort $(PRIVATE_API)) <(sort $(LIGHT_GREYLIST) $(DARK_GREYLIST)) > $@



# Include subdirectory makefiles

# ============================================================

api/current.txt

+168 −112

File changed.

Preview size limit exceeded, changes collapsed.

cmds/incidentd/src/Section.cpp

+19 −59
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#include <dirent.h>

#include <errno.h>

#include <wait.h>



#include <mutex>

#include <set>
@@ -53,48 +52,14 @@ const int FIELD_ID_INCIDENT_HEADER = 1; 
const int FIELD_ID_INCIDENT_METADATA = 2;



// incident section parameters

const int WAIT_MAX = 5;

const struct timespec WAIT_INTERVAL_NS = {0, 200 * 1000 * 1000};

const char INCIDENT_HELPER[] = "/system/bin/incident_helper";

const char GZIP[] = "/system/bin/gzip";

const char* GZIP[] = {"/system/bin/gzip", NULL};



static pid_t fork_execute_incident_helper(const int id, Fpipe* p2cPipe, Fpipe* c2pPipe) {

    const char* ihArgs[]{INCIDENT_HELPER, "-s", String8::format("%d", id).string(), NULL};

    return fork_execute_cmd(INCIDENT_HELPER, const_cast<char**>(ihArgs), p2cPipe, c2pPipe);

    return fork_execute_cmd(const_cast<char**>(ihArgs), p2cPipe, c2pPipe);

}



// ================================================================================

static status_t statusCode(int status) {

    if (WIFSIGNALED(status)) {

        VLOG("return by signal: %s", strerror(WTERMSIG(status)));

        return -WTERMSIG(status);

    } else if (WIFEXITED(status) && WEXITSTATUS(status) > 0) {

        VLOG("return by exit: %s", strerror(WEXITSTATUS(status)));

        return -WEXITSTATUS(status);

    }

    return NO_ERROR;

}



static status_t kill_child(pid_t pid) {

    int status;

    VLOG("try to kill child process %d", pid);

    kill(pid, SIGKILL);

    if (waitpid(pid, &status, 0) == -1) return -1;

    return statusCode(status);

}



static status_t wait_child(pid_t pid) {

    int status;

    bool died = false;

    // wait for child to report status up to 1 seconds

    for (int loop = 0; !died && loop < WAIT_MAX; loop++) {

        if (waitpid(pid, &status, WNOHANG) == pid) died = true;

        // sleep for 0.2 second

        nanosleep(&WAIT_INTERVAL_NS, NULL);

    }

    if (!died) return kill_child(pid);

    return statusCode(status);

}

// ================================================================================

static status_t write_section_header(int fd, int sectionId, size_t size) {

    uint8_t buf[20];
@@ -328,12 +293,15 @@ status_t FileSection::Execute(ReportRequestSet* requests) const { 
}

// ================================================================================

GZipSection::GZipSection(int id, const char* filename, ...) : Section(id) {

    name = "gzip ";

    name += filename;

    va_list args;

    va_start(args, filename);

    mFilenames = varargs(filename, args);

    va_end(args);

    name = "gzip";

    for (int i = 0; mFilenames[i] != NULL; i++) {

        name += " ";

        name += mFilenames[i];

    }

}



GZipSection::~GZipSection() {}
@@ -362,8 +330,7 @@ status_t GZipSection::Execute(ReportRequestSet* requests) const { 
        return -errno;

    }



    const char* gzipArgs[]{GZIP, NULL};

    pid_t pid = fork_execute_cmd(GZIP, const_cast<char**>(gzipArgs), &p2cPipe, &c2pPipe);

    pid_t pid = fork_execute_cmd((char* const*)GZIP, &p2cPipe, &c2pPipe);

    if (pid == -1) {

        ALOGW("GZipSection '%s' failed to fork", this->name.string());

        return -errno;
@@ -559,19 +526,27 @@ status_t WorkerThreadSection::Execute(ReportRequestSet* requests) const { 
// ================================================================================

CommandSection::CommandSection(int id, const int64_t timeoutMs, const char* command, ...)

    : Section(id, timeoutMs) {

    name = command;

    va_list args;

    va_start(args, command);

    mCommand = varargs(command, args);

    va_end(args);

    name = "cmd";

    for (int i = 0; mCommand[i] != NULL; i++) {

        name += " ";

        name += mCommand[i];

    }

}



CommandSection::CommandSection(int id, const char* command, ...) : Section(id) {

    name = command;

    va_list args;

    va_start(args, command);

    mCommand = varargs(command, args);

    va_end(args);

    name = "cmd";

    for (int i = 0; mCommand[i] != NULL; i++) {

        name += " ";

        name += mCommand[i];

    }

}



CommandSection::~CommandSection() { free(mCommand); }
@@ -586,26 +561,11 @@ status_t CommandSection::Execute(ReportRequestSet* requests) const { 
        return -errno;

    }



    pid_t cmdPid = fork();

    pid_t cmdPid = fork_execute_cmd((char* const*)mCommand, NULL, &cmdPipe);

    if (cmdPid == -1) {

        ALOGW("CommandSection '%s' failed to fork", this->name.string());

        return -errno;

    }

    // child process to execute the command as root

    if (cmdPid == 0) {

        // replace command's stdout with ihPipe's write Fd

        if (dup2(cmdPipe.writeFd().get(), STDOUT_FILENO) != 1 || !ihPipe.close() ||

            !cmdPipe.close()) {

            ALOGW("CommandSection '%s' failed to set up stdout: %s", this->name.string(),

                  strerror(errno));

            _exit(EXIT_FAILURE);

        }

        execvp(this->mCommand[0], (char* const*)this->mCommand);

        int err = errno;  // record command error code

        ALOGW("CommandSection '%s' failed in executing command: %s", this->name.string(),

              strerror(errno));

        _exit(err);  // exit with command error code

    }

    pid_t ihPid = fork_execute_incident_helper(this->id, &cmdPipe, &ihPipe);

    if (ihPid == -1) {

        ALOGW("CommandSection '%s' failed to fork", this->name.string());

cmds/incidentd/src/incidentd_util.cpp

+49 −11
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "incidentd_util.h"



#include <sys/prctl.h>

#include <wait.h>



#include "section_list.h"
@@ -57,27 +58,28 @@ unique_fd& Fpipe::readFd() { return mRead; } 


unique_fd& Fpipe::writeFd() { return mWrite; }



pid_t fork_execute_cmd(const char* cmd, char* const argv[], Fpipe* input, Fpipe* output) {

pid_t fork_execute_cmd(char* const argv[], Fpipe* input, Fpipe* output) {

    // fork used in multithreaded environment, avoid adding unnecessary code in child process

    pid_t pid = fork();

    if (pid == 0) {

        if (TEMP_FAILURE_RETRY(dup2(input->readFd().get(), STDIN_FILENO)) < 0 || !input->close() ||

            TEMP_FAILURE_RETRY(dup2(output->writeFd().get(), STDOUT_FILENO)) < 0 ||

        VLOG("[In child]cmd %s", argv[0]);

        if (input != NULL && (TEMP_FAILURE_RETRY(dup2(input->readFd().get(), STDIN_FILENO)) < 0 ||

                              !input->close())) {

            ALOGW("Failed to dup2 stdin.");

            _exit(EXIT_FAILURE);

        }

        if (TEMP_FAILURE_RETRY(dup2(output->writeFd().get(), STDOUT_FILENO)) < 0 ||

            !output->close()) {

            ALOGW("Can't setup stdin and stdout for command %s", cmd);

            ALOGW("Failed to dup2 stdout.");

            _exit(EXIT_FAILURE);

        }



        /* make sure the child dies when incidentd dies */

        prctl(PR_SET_PDEATHSIG, SIGKILL);



        execv(cmd, argv);



        ALOGW("%s failed in the child process: %s", cmd, strerror(errno));

        _exit(EXIT_FAILURE);  // always exits with failure if any

        execvp(argv[0], argv);

        _exit(errno);  // always exits with failure if any

    }

    // close the fds used in child process.

    input->readFd().reset();

    if (input != NULL) input->readFd().reset();

    output->writeFd().reset();

    return pid;

}
@@ -111,3 +113,39 @@ uint64_t Nanotime() { 
    clock_gettime(CLOCK_MONOTONIC, &ts);

    return static_cast<uint64_t>(ts.tv_sec * NANOS_PER_SEC + ts.tv_nsec);

}



// ================================================================================

const int WAIT_MAX = 5;

const struct timespec WAIT_INTERVAL_NS = {0, 200 * 1000 * 1000};



static status_t statusCode(int status) {

    if (WIFSIGNALED(status)) {

        VLOG("return by signal: %s", strerror(WTERMSIG(status)));

        return -WTERMSIG(status);

    } else if (WIFEXITED(status) && WEXITSTATUS(status) > 0) {

        VLOG("return by exit: %s", strerror(WEXITSTATUS(status)));

        return -WEXITSTATUS(status);

    }

    return NO_ERROR;

}



status_t kill_child(pid_t pid) {

    int status;

    VLOG("try to kill child process %d", pid);

    kill(pid, SIGKILL);

    if (waitpid(pid, &status, 0) == -1) return -1;

    return statusCode(status);

}



status_t wait_child(pid_t pid) {

    int status;

    bool died = false;

    // wait for child to report status up to 1 seconds

    for (int loop = 0; !died && loop < WAIT_MAX; loop++) {

        if (waitpid(pid, &status, WNOHANG) == pid) died = true;

        // sleep for 0.2 second

        nanosleep(&WAIT_INTERVAL_NS, NULL);

    }

    if (!died) return kill_child(pid);

    return statusCode(status);

}