| commit | a4060452e3f59cf1b33be22313921a5fad71fafb | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Mon Dec 04 15:21:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 04 15:21:31 2023 +0000 |
| tree | 565ffd69c61759d3d9ee175d80c205fd0fb43402 | |
| parent | 6748fef9a35cbcd7204ed7b7b19933d2e4630a03 [diff] | |
| parent | dec4e24b42232d50ce9701a73c8e3e1bc78108b6 [diff] |
Merge "Explicitly includes IGraphicBufferProducer.h in gui/view/Surface.h" into main am: dec4e24b42 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2846814 Change-Id: I2b0968d6dbd18b12cc081ea4d922e4e589596ee3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/gui/include/gui/view/Surface.h b/libs/gui/include/gui/view/Surface.h index f7dcbc6..b7aba2b 100644 --- a/libs/gui/include/gui/view/Surface.h +++ b/libs/gui/include/gui/view/Surface.h
@@ -24,9 +24,9 @@ #include <binder/IBinder.h> #include <binder/Parcelable.h> -namespace android { +#include <gui/IGraphicBufferProducer.h> -class IGraphicBufferProducer; +namespace android { namespace view {
diff --git a/libs/gui/view/Surface.cpp b/libs/gui/view/Surface.cpp index 198908d..7c15e7c 100644 --- a/libs/gui/view/Surface.cpp +++ b/libs/gui/view/Surface.cpp
@@ -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>