Snap for 11630439 from dc6c455e389535c666e69ea170d579927aa21a3b to sdk-release
Change-Id: I5997e6dc966cf3b46d20837393590d7c2af02ef0
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
index 5979489..6093a61 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
index 4f35cb3..46f7311 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
index 854fb71..661b80b 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h b/arm/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
index 70f8af3..8568b8f 100644
--- a/arm/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
+++ b/arm/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
@@ -41,6 +41,7 @@
// keyInputSource: to change audio input source, value is an int in audio_source_t
// (defined in media/mediarecorder.h)
// keyScreenState: either "on" or "off"
+ // keyScreenRotation: one of: 0, 90, 180, 270
static const char * const keyRouting;
static const char * const keySamplingRate;
static const char * const keyFormat;
@@ -48,6 +49,7 @@
static const char * const keyFrameCount;
static const char * const keyInputSource;
static const char * const keyScreenState;
+ static const char * const keyScreenRotation;
// TODO(b/73175392) consider improvement to AIDL StreamOut interface.
// keyClosing: "true" when AudioOutputDescriptor is closing. Used by A2DP HAL.
diff --git a/arm/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h b/arm/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
index a49a859..8cd916f 100644
--- a/arm/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
+++ b/arm/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
@@ -47,8 +47,8 @@
void onDisconnect() override EXCLUDES(mMutex);
void addAndGetFrameTimestamps(const NewFrameEventsEntry* newTimestamps,
FrameEventHistoryDelta* outDelta) override EXCLUDES(mMutex);
- void updateFrameTimestamps(uint64_t frameNumber, nsecs_t refreshStartTime,
- const sp<Fence>& gpuCompositionDoneFence,
+ void updateFrameTimestamps(uint64_t frameNumber, uint64_t previousFrameNumber,
+ nsecs_t refreshStartTime, const sp<Fence>& gpuCompositionDoneFence,
const sp<Fence>& presentFence, const sp<Fence>& prevReleaseFence,
CompositorTiming compositorTiming, nsecs_t latchTime,
nsecs_t dequeueReadyTime) EXCLUDES(mMutex);
diff --git a/arm/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h b/arm/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
index 39bcb4a..508c143 100644
--- a/arm/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
+++ b/arm/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
@@ -95,15 +95,18 @@
status_t readFromParcel(const Parcel* input) override;
FrameEventHistoryStats() = default;
- FrameEventHistoryStats(uint64_t fn, const sp<Fence>& gpuCompFence, CompositorTiming compTiming,
+ FrameEventHistoryStats(uint64_t frameNumber, uint64_t previousFrameNumber,
+ const sp<Fence>& gpuCompFence, CompositorTiming compTiming,
nsecs_t refreshTime, nsecs_t dequeueReadyTime)
- : frameNumber(fn),
+ : frameNumber(frameNumber),
+ previousFrameNumber(previousFrameNumber),
gpuCompositionDoneFence(gpuCompFence),
compositorTiming(compTiming),
refreshStartTime(refreshTime),
dequeueReadyTime(dequeueReadyTime) {}
uint64_t frameNumber;
+ uint64_t previousFrameNumber;
sp<Fence> gpuCompositionDoneFence;
CompositorTiming compositorTiming;
nsecs_t refreshStartTime;
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so
index e132e1f..2fec4aa 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so
index dda4361..652d88f 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libbcinfo.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libbcinfo.so
index 78ffad2..594aa8b 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libbcinfo.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so
index 5656dde..7455c32 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libgui.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so
index ac2e6c5..9a1a48c 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbcinfo.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbcinfo.so
index 59466e3..f5d1b7c 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbcinfo.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/arm64/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h b/arm64/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
index 70f8af3..8568b8f 100644
--- a/arm64/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
+++ b/arm64/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
@@ -41,6 +41,7 @@
// keyInputSource: to change audio input source, value is an int in audio_source_t
// (defined in media/mediarecorder.h)
// keyScreenState: either "on" or "off"
+ // keyScreenRotation: one of: 0, 90, 180, 270
static const char * const keyRouting;
static const char * const keySamplingRate;
static const char * const keyFormat;
@@ -48,6 +49,7 @@
static const char * const keyFrameCount;
static const char * const keyInputSource;
static const char * const keyScreenState;
+ static const char * const keyScreenRotation;
// TODO(b/73175392) consider improvement to AIDL StreamOut interface.
// keyClosing: "true" when AudioOutputDescriptor is closing. Used by A2DP HAL.
diff --git a/arm64/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h b/arm64/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
index a49a859..8cd916f 100644
--- a/arm64/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
+++ b/arm64/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
@@ -47,8 +47,8 @@
void onDisconnect() override EXCLUDES(mMutex);
void addAndGetFrameTimestamps(const NewFrameEventsEntry* newTimestamps,
FrameEventHistoryDelta* outDelta) override EXCLUDES(mMutex);
- void updateFrameTimestamps(uint64_t frameNumber, nsecs_t refreshStartTime,
- const sp<Fence>& gpuCompositionDoneFence,
+ void updateFrameTimestamps(uint64_t frameNumber, uint64_t previousFrameNumber,
+ nsecs_t refreshStartTime, const sp<Fence>& gpuCompositionDoneFence,
const sp<Fence>& presentFence, const sp<Fence>& prevReleaseFence,
CompositorTiming compositorTiming, nsecs_t latchTime,
nsecs_t dequeueReadyTime) EXCLUDES(mMutex);
diff --git a/arm64/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h b/arm64/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
index 39bcb4a..508c143 100644
--- a/arm64/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
+++ b/arm64/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
@@ -95,15 +95,18 @@
status_t readFromParcel(const Parcel* input) override;
FrameEventHistoryStats() = default;
- FrameEventHistoryStats(uint64_t fn, const sp<Fence>& gpuCompFence, CompositorTiming compTiming,
+ FrameEventHistoryStats(uint64_t frameNumber, uint64_t previousFrameNumber,
+ const sp<Fence>& gpuCompFence, CompositorTiming compTiming,
nsecs_t refreshTime, nsecs_t dequeueReadyTime)
- : frameNumber(fn),
+ : frameNumber(frameNumber),
+ previousFrameNumber(previousFrameNumber),
gpuCompositionDoneFence(gpuCompFence),
compositorTiming(compTiming),
refreshStartTime(refreshTime),
dequeueReadyTime(dequeueReadyTime) {}
uint64_t frameNumber;
+ uint64_t previousFrameNumber;
sp<Fence> gpuCompositionDoneFence;
CompositorTiming compositorTiming;
nsecs_t refreshStartTime;
diff --git a/x86/arch-x86/shared/vndk-core/libgui.so b/x86/arch-x86/shared/vndk-core/libgui.so
index b7f16ff..0191299 100755
--- a/x86/arch-x86/shared/vndk-core/libgui.so
+++ b/x86/arch-x86/shared/vndk-core/libgui.so
Binary files differ
diff --git a/x86/arch-x86/shared/vndk-core/libmedia_helper.so b/x86/arch-x86/shared/vndk-core/libmedia_helper.so
index ef7790d..a4e1a55 100755
--- a/x86/arch-x86/shared/vndk-core/libmedia_helper.so
+++ b/x86/arch-x86/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/x86/arch-x86/shared/vndk-sp/libbcinfo.so b/x86/arch-x86/shared/vndk-sp/libbcinfo.so
index 66d7acd..9ee6d8d 100755
--- a/x86/arch-x86/shared/vndk-sp/libbcinfo.so
+++ b/x86/arch-x86/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/x86/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h b/x86/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
index 70f8af3..8568b8f 100644
--- a/x86/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
+++ b/x86/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
@@ -41,6 +41,7 @@
// keyInputSource: to change audio input source, value is an int in audio_source_t
// (defined in media/mediarecorder.h)
// keyScreenState: either "on" or "off"
+ // keyScreenRotation: one of: 0, 90, 180, 270
static const char * const keyRouting;
static const char * const keySamplingRate;
static const char * const keyFormat;
@@ -48,6 +49,7 @@
static const char * const keyFrameCount;
static const char * const keyInputSource;
static const char * const keyScreenState;
+ static const char * const keyScreenRotation;
// TODO(b/73175392) consider improvement to AIDL StreamOut interface.
// keyClosing: "true" when AudioOutputDescriptor is closing. Used by A2DP HAL.
diff --git a/x86/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h b/x86/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
index a49a859..8cd916f 100644
--- a/x86/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
+++ b/x86/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
@@ -47,8 +47,8 @@
void onDisconnect() override EXCLUDES(mMutex);
void addAndGetFrameTimestamps(const NewFrameEventsEntry* newTimestamps,
FrameEventHistoryDelta* outDelta) override EXCLUDES(mMutex);
- void updateFrameTimestamps(uint64_t frameNumber, nsecs_t refreshStartTime,
- const sp<Fence>& gpuCompositionDoneFence,
+ void updateFrameTimestamps(uint64_t frameNumber, uint64_t previousFrameNumber,
+ nsecs_t refreshStartTime, const sp<Fence>& gpuCompositionDoneFence,
const sp<Fence>& presentFence, const sp<Fence>& prevReleaseFence,
CompositorTiming compositorTiming, nsecs_t latchTime,
nsecs_t dequeueReadyTime) EXCLUDES(mMutex);
diff --git a/x86/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h b/x86/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
index 39bcb4a..508c143 100644
--- a/x86/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
+++ b/x86/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
@@ -95,15 +95,18 @@
status_t readFromParcel(const Parcel* input) override;
FrameEventHistoryStats() = default;
- FrameEventHistoryStats(uint64_t fn, const sp<Fence>& gpuCompFence, CompositorTiming compTiming,
+ FrameEventHistoryStats(uint64_t frameNumber, uint64_t previousFrameNumber,
+ const sp<Fence>& gpuCompFence, CompositorTiming compTiming,
nsecs_t refreshTime, nsecs_t dequeueReadyTime)
- : frameNumber(fn),
+ : frameNumber(frameNumber),
+ previousFrameNumber(previousFrameNumber),
gpuCompositionDoneFence(gpuCompFence),
compositorTiming(compTiming),
refreshStartTime(refreshTime),
dequeueReadyTime(dequeueReadyTime) {}
uint64_t frameNumber;
+ uint64_t previousFrameNumber;
sp<Fence> gpuCompositionDoneFence;
CompositorTiming compositorTiming;
nsecs_t refreshStartTime;
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so
index 3b27368..f748ebf 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libgui.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_helper.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_helper.so
index 92767e6..12d0601 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_helper.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libbcinfo.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libbcinfo.so
index 9887574..26b01af 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libbcinfo.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-core/libgui.so b/x86_64/arch-x86_64/shared/vndk-core/libgui.so
index fe8a0a5..4d93d80 100755
--- a/x86_64/arch-x86_64/shared/vndk-core/libgui.so
+++ b/x86_64/arch-x86_64/shared/vndk-core/libgui.so
Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-core/libmedia_helper.so b/x86_64/arch-x86_64/shared/vndk-core/libmedia_helper.so
index 695eb7c..c966759 100755
--- a/x86_64/arch-x86_64/shared/vndk-core/libmedia_helper.so
+++ b/x86_64/arch-x86_64/shared/vndk-core/libmedia_helper.so
Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-sp/libbcinfo.so b/x86_64/arch-x86_64/shared/vndk-sp/libbcinfo.so
index 3fe4c06..84bb8ab 100755
--- a/x86_64/arch-x86_64/shared/vndk-sp/libbcinfo.so
+++ b/x86_64/arch-x86_64/shared/vndk-sp/libbcinfo.so
Binary files differ
diff --git a/x86_64/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h b/x86_64/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
index 70f8af3..8568b8f 100644
--- a/x86_64/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
+++ b/x86_64/include/frameworks/av/media/libmediahelper/include/media/AudioParameter.h
@@ -41,6 +41,7 @@
// keyInputSource: to change audio input source, value is an int in audio_source_t
// (defined in media/mediarecorder.h)
// keyScreenState: either "on" or "off"
+ // keyScreenRotation: one of: 0, 90, 180, 270
static const char * const keyRouting;
static const char * const keySamplingRate;
static const char * const keyFormat;
@@ -48,6 +49,7 @@
static const char * const keyFrameCount;
static const char * const keyInputSource;
static const char * const keyScreenState;
+ static const char * const keyScreenRotation;
// TODO(b/73175392) consider improvement to AIDL StreamOut interface.
// keyClosing: "true" when AudioOutputDescriptor is closing. Used by A2DP HAL.
diff --git a/x86_64/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h b/x86_64/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
index a49a859..8cd916f 100644
--- a/x86_64/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
+++ b/x86_64/include/frameworks/native/libs/gui/include/gui/BLASTBufferQueue.h
@@ -47,8 +47,8 @@
void onDisconnect() override EXCLUDES(mMutex);
void addAndGetFrameTimestamps(const NewFrameEventsEntry* newTimestamps,
FrameEventHistoryDelta* outDelta) override EXCLUDES(mMutex);
- void updateFrameTimestamps(uint64_t frameNumber, nsecs_t refreshStartTime,
- const sp<Fence>& gpuCompositionDoneFence,
+ void updateFrameTimestamps(uint64_t frameNumber, uint64_t previousFrameNumber,
+ nsecs_t refreshStartTime, const sp<Fence>& gpuCompositionDoneFence,
const sp<Fence>& presentFence, const sp<Fence>& prevReleaseFence,
CompositorTiming compositorTiming, nsecs_t latchTime,
nsecs_t dequeueReadyTime) EXCLUDES(mMutex);
diff --git a/x86_64/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h b/x86_64/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
index 39bcb4a..508c143 100644
--- a/x86_64/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
+++ b/x86_64/include/frameworks/native/libs/gui/include/gui/ITransactionCompletedListener.h
@@ -95,15 +95,18 @@
status_t readFromParcel(const Parcel* input) override;
FrameEventHistoryStats() = default;
- FrameEventHistoryStats(uint64_t fn, const sp<Fence>& gpuCompFence, CompositorTiming compTiming,
+ FrameEventHistoryStats(uint64_t frameNumber, uint64_t previousFrameNumber,
+ const sp<Fence>& gpuCompFence, CompositorTiming compTiming,
nsecs_t refreshTime, nsecs_t dequeueReadyTime)
- : frameNumber(fn),
+ : frameNumber(frameNumber),
+ previousFrameNumber(previousFrameNumber),
gpuCompositionDoneFence(gpuCompFence),
compositorTiming(compTiming),
refreshStartTime(refreshTime),
dequeueReadyTime(dequeueReadyTime) {}
uint64_t frameNumber;
+ uint64_t previousFrameNumber;
sp<Fence> gpuCompositionDoneFence;
CompositorTiming compositorTiming;
nsecs_t refreshStartTime;
