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

Commit 91a86774 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Revert "Support priority based dumpsys in surface flinger" 

This reverts commit deb36f24.

Reason for revert: fixing git_master/mini_emulator_x86-userdebug break

Change-Id: I4729bcb0f4c6ee1f388b916666a0ddbf8a5da5bd
parent deb36f24

services/surfaceflinger/Android.bp

+0 −2
Original line number Original line Diff line number Diff line 
cc_library_static {

cc_library_static {

    name: "libsurfaceflingerincludes",

    name: "libsurfaceflingerincludes",

    export_include_dirs: ["."],

    export_include_dirs: ["."],

    static_libs = ["libserviceutils"],

    export_static_lib_headers = ["libserviceutils"],

}

}





subdirs = ["tests/fakehwc"]
 
subdirs = ["tests/fakehwc"]
 
 No newline at end of file

services/surfaceflinger/Android.mk

+2 −6
Original line number Original line Diff line number Diff line
@@ -67,10 +67,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libtrace_proto \

    libtrace_proto \

    libvkjson \

    libvkjson \

    libvr_manager \

    libvr_manager \

    libvrflinger \

    libvrflinger

    libserviceutils



LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libserviceutils





LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \

    android.frameworks.vr.composer@1.0 \

    android.frameworks.vr.composer@1.0 \
@@ -148,8 +145,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libdl

    libdl





LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain

LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain

LOCAL_STATIC_LIBRARIES := libtrace_proto \

LOCAL_STATIC_LIBRARIES := libtrace_proto

    libserviceutils





LOCAL_MODULE := surfaceflinger

LOCAL_MODULE := surfaceflinger

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -3459,7 +3459,8 @@ void SurfaceFlinger::setPowerMode(const sp<IBinder>& display, int mode) { 




// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------





status_t SurfaceFlinger::doDump(int fd, const Vector<String16>& args) {

status_t SurfaceFlinger::dump(int fd, const Vector<String16>& args)

{

    String8 result;

    String8 result;





    IPCThreadState* ipc = IPCThreadState::self();

    IPCThreadState* ipc = IPCThreadState::self();

services/surfaceflinger/SurfaceFlinger.h

+1 −12
Original line number Original line Diff line number Diff line
@@ -47,8 +47,6 @@ 




#include <hardware/hwcomposer_defs.h>

#include <hardware/hwcomposer_defs.h>





#include <serviceutils/PriorityDumper.h>



#include <system/graphics.h>

#include <system/graphics.h>





#include <private/gui/LayerState.h>

#include <private/gui/LayerState.h>
@@ -107,7 +105,6 @@ enum { 
};

};





class SurfaceFlinger : public BnSurfaceComposer,

class SurfaceFlinger : public BnSurfaceComposer,

                       public PriorityDumper,

                       private IBinder::DeathRecipient,

                       private IBinder::DeathRecipient,

#ifdef USE_HWC2

#ifdef USE_HWC2

                       private HWC2::ComposerCallback

                       private HWC2::ComposerCallback
@@ -275,7 +272,7 @@ private: 
     */

     */

    virtual status_t onTransact(uint32_t code, const Parcel& data,

    virtual status_t onTransact(uint32_t code, const Parcel& data,

        Parcel* reply, uint32_t flags);

        Parcel* reply, uint32_t flags);

    virtual status_t dump(int fd, const Vector<String16>& args) { return priorityDump(fd, args); }

    virtual status_t dump(int fd, const Vector<String16>& args);





    /* ------------------------------------------------------------------------

    /* ------------------------------------------------------------------------

     * ISurfaceComposer interface

     * ISurfaceComposer interface
@@ -595,13 +592,6 @@ private: 
    /* ------------------------------------------------------------------------

    /* ------------------------------------------------------------------------

     * Debugging & dumpsys

     * Debugging & dumpsys

     */

     */

public:

    status_t dumpCritical(int fd, const Vector<String16>& /*args*/) {

        return doDump(fd, Vector<String16>());

    }



    status_t dumpAll(int fd, const Vector<String16>& args) { return doDump(fd, args); }

private:

    void listLayersLocked(const Vector<String16>& args, size_t& index, String8& result) const;

    void listLayersLocked(const Vector<String16>& args, size_t& index, String8& result) const;

    void dumpStatsLocked(const Vector<String16>& args, size_t& index, String8& result) const;

    void dumpStatsLocked(const Vector<String16>& args, size_t& index, String8& result) const;

    void clearStatsLocked(const Vector<String16>& args, size_t& index, String8& result);

    void clearStatsLocked(const Vector<String16>& args, size_t& index, String8& result);
@@ -626,7 +616,6 @@ private: 
    bool isLayerTripleBufferingDisabled() const {

    bool isLayerTripleBufferingDisabled() const {

        return this->mLayerTripleBufferingDisabled;

        return this->mLayerTripleBufferingDisabled;

    }

    }

    status_t doDump(int fd, const Vector<String16>& args);





#ifdef USE_HWC2

#ifdef USE_HWC2

    /* ------------------------------------------------------------------------

    /* ------------------------------------------------------------------------

services/surfaceflinger/main_surfaceflinger.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -105,8 +105,7 @@ int main(int, char**) { 




    // publish surface flinger

    // publish surface flinger

    sp<IServiceManager> sm(defaultServiceManager());

    sp<IServiceManager> sm(defaultServiceManager());

    sm->addService(String16(SurfaceFlinger::getServiceName()), flinger, false,

    sm->addService(String16(SurfaceFlinger::getServiceName()), flinger, false);

                   IServiceManager::DUMP_PRIORITY_CRITICAL);





    // publish GpuService

    // publish GpuService

    sp<GpuService> gpuservice = new GpuService();

    sp<GpuService> gpuservice = new GpuService();