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

Commit fb7105e5 authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Explicitly includes IGraphicBufferProducer.h in gui/view/Surface.h"... 

Merge "Explicitly includes IGraphicBufferProducer.h in gui/view/Surface.h" into main am: dec4e24b am: 4c383d27

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2846814



Change-Id: Ice25d734819c31d4b6f0ba8b02e15e6616f0fa6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eebe59d1 4c383d27

libs/gui/include/gui/view/Surface.h

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#include <binder/IBinder.h>

#include <binder/Parcelable.h>



namespace android {

#include <gui/IGraphicBufferProducer.h>



class IGraphicBufferProducer;

namespace android {



namespace view {

libs/gui/view/Surface.cpp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <android/binder_parcel.h>

#include <android/native_window.h>

#include <binder/Parcel.h>

#include <gui/IGraphicBufferProducer.h>

#include <gui/Surface.h>

#include <gui/view/Surface.h>

#include <system/window.h>