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

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

Snap for 4977457 from 04c1e67e to qt-release 

Change-Id: Ie1abf44afad4ce4e2518eeb3b4991dd2150a742f
parents 9ec0324a 04c1e67e

cmds/dumpstate/dumpstate.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1463,6 +1463,12 @@ static void DumpstateTelephonyOnly() { 
    RunDumpsys("APP SERVICES NON-PLATFORM", {"activity", "service", "all-non-platform"},

            DUMPSYS_COMPONENTS_OPTIONS);



    printf("========================================================\n");

    printf("== Checkins\n");

    printf("========================================================\n");



    RunDumpsys("CHECKIN BATTERYSTATS", {"batterystats", "-c"});



    printf("========================================================\n");

    printf("== dumpstate: done (id %d)\n", ds.id_);

    printf("========================================================\n");

services/surfaceflinger/Android.bp

+2 −10
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ cc_defaults { 
        "libvulkan",

    ],

    static_libs: [

        "librenderengine",

        "libserviceutils",

        "libtrace_proto",

        "libvkjson",
@@ -66,6 +67,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.2-command-buffer",

    ],

    export_static_lib_headers: [

        "librenderengine",

        "libserviceutils",

    ],

    export_shared_lib_headers: [
@@ -118,16 +120,6 @@ filegroup { 
        "LayerVector.cpp",

        "MonitoredProducer.cpp",

        "RenderArea.cpp",

        "RenderEngine/Description.cpp",

        "RenderEngine/GLES20RenderEngine.cpp",

        "RenderEngine/GLExtensions.cpp",

        "RenderEngine/Image.cpp",

        "RenderEngine/Mesh.cpp",

        "RenderEngine/Program.cpp",

        "RenderEngine/ProgramCache.cpp",

        "RenderEngine/RenderEngine.cpp",

        "RenderEngine/Surface.cpp",

        "RenderEngine/Texture.cpp",

        "Scheduler/DispSync.cpp",

        "Scheduler/DispSyncSource.cpp",

        "Scheduler/EventControlThread.cpp",

services/surfaceflinger/BufferLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "DisplayDevice.h"

#include "LayerRejecter.h"



#include "RenderEngine/RenderEngine.h"

#include <renderengine/RenderEngine.h>



#include <gui/BufferItem.h>

#include <gui/BufferQueue.h>

services/surfaceflinger/BufferLayer.h

+2 −3
Original line number Diff line number Diff line
@@ -24,13 +24,12 @@ 
#include "FrameTracker.h"

#include "LayerVector.h"

#include "MonitoredProducer.h"

#include "RenderEngine/Mesh.h"

#include "RenderEngine/Texture.h"

#include "SurfaceFlinger.h"



#include <gui/ISurfaceComposerClient.h>

#include <gui/LayerState.h>



#include <renderengine/Mesh.h>

#include <renderengine/Texture.h>

#include <ui/FrameStats.h>

#include <ui/GraphicBuffer.h>

#include <ui/PixelFormat.h>

services/surfaceflinger/BufferLayerConsumer.cpp

+2 −5
Original line number Diff line number Diff line
@@ -20,10 +20,7 @@ 
//#define LOG_NDEBUG 0



#include "BufferLayerConsumer.h"



#include "Layer.h"

#include "RenderEngine/Image.h"

#include "RenderEngine/RenderEngine.h"

#include "Scheduler/DispSync.h"



#include <inttypes.h>
@@ -38,9 +35,9 @@ 
#include <gui/GLConsumer.h>

#include <gui/ISurfaceComposer.h>

#include <gui/SurfaceComposerClient.h>



#include <private/gui/ComposerService.h>



#include <renderengine/Image.h>

#include <renderengine/RenderEngine.h>

#include <utils/Log.h>

#include <utils/String8.h>

#include <utils/Trace.h>