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

Commit 5218ed04 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12623742 from 2c6de794 to 25Q1-release 

Change-Id: I6f6bc32cb55249c9334406c8509ab40e32e3ac7d
parents c7cacafa 2c6de794

libs/battery/LongArrayMultiStateCounter.cpp

+4 −1
Original line number Diff line number Diff line
@@ -46,9 +46,12 @@ Uint64ArrayRW &Uint64ArrayRW::operator=(const Uint64Array &t) { 
    }

    if (mSize != 0) {

        if (t.data() != nullptr) {

            if (mData == nullptr) {

                mData = new uint64_t[mSize];

            }

            memcpy(mData, t.data(), mSize * sizeof(uint64_t));

        } else {

            delete[] mData;

            mData = nullptr;

        }

    }

libs/binder/tests/binderUtilsHostTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ TEST(UtilsHost, ExecuteLongRunning) { 
        });

        auto elapsedMs = millisSince(start);

        EXPECT_GE(elapsedMs, 1000);

        EXPECT_LT(elapsedMs, 2000);

        EXPECT_LT(elapsedMs, 3000); // b/377571547: higher to reduce flake



        ASSERT_TRUE(result.has_value());

        EXPECT_EQ(std::nullopt, result->exitCode);
@@ -65,7 +65,7 @@ TEST(UtilsHost, ExecuteLongRunning) { 


    // ~CommandResult() called, child process is killed.

    // Assert that the second sleep does not finish.

    EXPECT_LT(millisSince(start), 2000);

    EXPECT_LT(millisSince(start), 3000);

}



TEST(UtilsHost, ExecuteLongRunning2) {

libs/gui/libgui_flags.aconfig

+8 −0
Original line number Diff line number Diff line 
package: "com.android.graphics.libgui.flags"

container: "system"



flag {

  name: "apply_picture_profiles"

  namespace: "tv_os_media"

  description: "This flag controls sending picture profiles from BBQ to Composer HAL"

  bug: "337330263"

  is_fixed_read_only: true

} # apply_picture_profiles



flag {

  name: "bq_setframerate"

  namespace: "core_graphics"

libs/ui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ cc_library_shared { 
        "GraphicBuffer.cpp",

        "GraphicBufferAllocator.cpp",

        "GraphicBufferMapper.cpp",

        "PictureProfileHandle.cpp",

        "PixelFormat.cpp",

        "PublicFormat.cpp",

        "StaticAsserts.cpp",

services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockIPower.cpp→libs/ui/PictureProfileHandle.cpp

+11 −6
Original line number Diff line number Diff line 
/*

 * Copyright 2022 The Android Open Source Project

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,11 +14,16 @@ 
 * limitations under the License.

 */



#include "mock/DisplayHardware/MockIPower.h"

#include <ui/PictureProfileHandle.h>



namespace android::Hwc2::mock {

#include <format>



// Explicit default instantiation is recommended.

MockIPower::MockIPower() = default;

namespace android {



} // namespace android::Hwc2::mock
 
const PictureProfileHandle PictureProfileHandle::NONE(0);



::std::string toString(const PictureProfileHandle& handle) {

    return std::format("{:#010x}", handle.getId());

}



} // namespace android