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

Commit 9e705df4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9595907 from aae5b053 to udc-release 

Change-Id: I95e82abddf3a9d4c8f22fb6427cca99f2a29d5ed
parents 4666249e aae5b053

cmds/dumpstate/dumpstate.cpp

+15 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ void add_mountinfo(); 
#define SYSTEM_TRACE_SNAPSHOT "/data/misc/perfetto-traces/bugreport/systrace.pftrace"

#define CGROUPFS_DIR "/sys/fs/cgroup"

#define SDK_EXT_INFO "/apex/com.android.sdkext/bin/derive_sdk"

#define DROPBOX_DIR "/data/system/dropbox"



// TODO(narayan): Since this information has to be kept in sync

// with tombstoned, we should just put it in a common header.
@@ -526,6 +527,15 @@ static bool skip_not_stat(const char *path) { 
    return strcmp(path + len - sizeof(stat) + 1, stat); /* .../stat? */

}



static bool skip_wtf_strictmode(const char *path) {

    if (strstr(path, "_wtf")) {

        return true;

    } else if (strstr(path, "_strictmode")) {

        return true;

    }

    return false;

}



static bool skip_none(const char* path __attribute__((unused))) {

    return false;

}
@@ -1895,6 +1905,11 @@ Dumpstate::RunStatus Dumpstate::DumpstateDefaultAfterCritical() { 
    DumpIpTablesAsRoot();

    DumpDynamicPartitionInfo();

    ds.AddDir(OTA_METADATA_DIR, true);

    if (!PropertiesHelper::IsUserBuild()) {

        // Include dropbox entry files inside ZIP, but exclude

        // noisy WTF and StrictMode entries

        dump_files("", DROPBOX_DIR, skip_wtf_strictmode, _add_file_from_fd);

    }



    // Capture any IPSec policies in play. No keys are exposed here.

    RunCommand("IP XFRM POLICY", {"ip", "xfrm", "policy"}, CommandOptions::WithTimeout(10).Build());

cmds/dumpstate/tests/dumpstate_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,8 @@ class ZippedBugReportStreamTest : public DumpstateBaseTest { 
};



// Generate a quick LimitedOnly report redirected to a file, open it and verify entry exist.

TEST_F(ZippedBugReportStreamTest, StreamLimitedOnlyReport) {

// TODO: broken test tracked in b/249983726

TEST_F(ZippedBugReportStreamTest, DISABLED_StreamLimitedOnlyReport) {

    std::string out_path = kTestDataPath + "StreamLimitedOnlyReportOut.zip";

    android::base::unique_fd out_fd;

    CreateFd(out_path, &out_fd);

libs/binder/rust/rpcbinder/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -23,7 +23,13 @@ rust_library { 
        "liblibc",

        "liblog_rust",

    ],

    visibility: [

        "//device/google/cuttlefish/shared/minidroid/sample",

        "//packages/modules/Uwb",

        "//packages/modules/Virtualization:__subpackages__",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.compos",

        "com.android.uwb",

        "com.android.virt",
@@ -51,6 +57,7 @@ rust_library { 
        "libutils",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.compos",

        "com.android.uwb",

        "com.android.virt",
@@ -84,6 +91,7 @@ rust_bindgen { 
        "libutils",

    ],

    apex_available: [

        "//apex_available:platform",

        "com.android.compos",

        "com.android.uwb",

        "com.android.virt",

libs/jpegrecoverymap/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ cc_library { 
    export_include_dirs: ["include"],



    srcs: [

        "jpegencoder.cpp",

        "jpegencoderhelper.cpp",

    ],

}
@@ -73,6 +73,6 @@ cc_library { 
    export_include_dirs: ["include"],



    srcs: [

        "jpegdecoder.cpp",

        "jpegdecoderhelper.cpp",

    ],

}

libs/jpegrecoverymap/include/jpegrecoverymap/jpegdecoder.h→libs/jpegrecoverymap/include/jpegrecoverymap/jpegdecoderhelper.h

+6 −7
Original line number Diff line number Diff line 


/*

 * Copyright 2022 The Android Open Source Project

 *
@@ -15,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_JPEGRECOVERYMAP_JPEGDECODER_H

#define ANDROID_JPEGRECOVERYMAP_JPEGDECODER_H

#ifndef ANDROID_JPEGRECOVERYMAP_JPEGDECODERHELPER_H

#define ANDROID_JPEGRECOVERYMAP_JPEGDECODERHELPER_H



// We must include cstdio before jpeglib.h. It is a requirement of libjpeg.

#include <cstdio>
@@ -31,10 +30,10 @@ namespace android::recoverymap { 
 * Encapsulates a converter from JPEG to raw image (YUV420planer or grey-scale) format.

 * This class is not thread-safe.

 */

class JpegDecoder {

class JpegDecoderHelper {

public:

    JpegDecoder();

    ~JpegDecoder();

    JpegDecoderHelper();

    ~JpegDecoderHelper();

    /*

     * Decompresses JPEG image to raw image (YUV420planer, grey-scale or RGBA) format. After

     * calling this method, call getDecompressedImage() to get the image.
@@ -118,4 +117,4 @@ private: 
};

} /* namespace android  */



#endif // ANDROID_JPEGRECOVERYMAP_JPEGDECODER_H
 
#endif // ANDROID_JPEGRECOVERYMAP_JPEGDECODERHELPER_H