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

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

Snap for 4486962 from 3c0d2fbd to pi-release 

Change-Id: If16a8652fb722547de51b696c4662fad508fb019
parents c4f621c6 3c0d2fbd

cmds/cmd/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libselinux \

	libbinder



LOCAL_CFLAGS := -Wall -Werror



LOCAL_C_INCLUDES += \

    $(JNI_H_INCLUDE)

cmds/cmd/cmd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public: 
        if (is_selinux_enabled() && seLinuxContext.size() > 0) {

            String8 seLinuxContext8(seLinuxContext);

            security_context_t tmp = NULL;

            int ret = getfilecon(fullPath.string(), &tmp);

            getfilecon(fullPath.string(), &tmp);

            Unique_SecurityContext context(tmp);

            if (checkWrite) {

                int accessGranted = selinux_check_access(seLinuxContext8.string(), context.get(),

cmds/dumpstate/dumpstate.cpp

+3 −2
Original line number Diff line number Diff line
@@ -691,7 +691,9 @@ void Dumpstate::PrintHeader() const { 
    printf("Kernel: ");

    DumpFileToFd(STDOUT_FILENO, "", "/proc/version");

    printf("Command line: %s\n", strtok(cmdline_buf, "\n"));

    ds.RunCommand("UPTIME", {"uptime"}, CommandOptions::DEFAULT);

    printf("Uptime: ");

    RunCommandToFd(STDOUT_FILENO, "", {"uptime", "-p"},

                   CommandOptions::WithTimeout(1).Always().Build());

    printf("Bugreport format version: %s\n", version_.c_str());

    printf("Dumpstate info: id=%d pid=%d dry_run=%d args=%s extra_options=%s\n", id_, pid_,

           PropertiesHelper::IsDryRun(), args_.c_str(), extra_options_.c_str());
@@ -1093,7 +1095,6 @@ static void dumpstate() { 
    DurationReporter duration_reporter("DUMPSTATE");



    dump_dev_files("TRUSTY VERSION", "/sys/bus/platform/drivers/trusty", "trusty_version");

    /* TODO: Remove duplicate uptime call when tools use it from header */

    RunCommand("UPTIME", {"uptime"});

    DumpBlockStatFiles();

    dump_emmc_ecsd("/d/mmc0/mmc0:0001/ext_csd");

libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl

+1 −1
Original line number Diff line number Diff line
@@ -52,6 +52,6 @@ interface IPackageManagerNative { 
     * Unknown or unknowable versions are returned as 0.

     */



    int getVersionCodeForPackage(in String packageName);

    long getVersionCodeForPackage(in String packageName);



}

libs/gui/SurfaceComposerClient.cpp

+6 −1
Original line number Diff line number Diff line
@@ -543,9 +543,14 @@ SurfaceComposerClient::SurfaceComposerClient(const sp<IGraphicBufferProducer>& r 
{

}



SurfaceComposerClient::SurfaceComposerClient(const sp<ISurfaceComposerClient>& client)

    : mStatus(NO_ERROR), mClient(client)

{

}



void SurfaceComposerClient::onFirstRef() {

    sp<ISurfaceComposer> sf(ComposerService::getComposerService());

    if (sf != 0) {

    if (sf != 0 && mStatus == NO_INIT) {

        auto rootProducer = mParent.promote();

        sp<ISurfaceComposerClient> conn;

        conn = (rootProducer != nullptr) ? sf->createScopedConnection(rootProducer) :