Merge "Remove unused private Choreographer apis."
diff --git a/libs/nativedisplay/AChoreographer.cpp b/libs/nativedisplay/AChoreographer.cpp
index 4c4a34f..79d9b93 100644
--- a/libs/nativedisplay/AChoreographer.cpp
+++ b/libs/nativedisplay/AChoreographer.cpp
@@ -151,8 +151,6 @@
static Choreographer* getForThread();
virtual ~Choreographer() override EXCLUDES(gChoreographers.lock);
- int64_t getVsyncId() const;
- int64_t getFrameDeadline() const;
int64_t getFrameInterval() const;
bool inCallback() const;
@@ -449,14 +447,6 @@
}
}
-int64_t Choreographer::getVsyncId() const {
- return mLastVsyncEventData.id;
-}
-
-int64_t Choreographer::getFrameDeadline() const {
- return mLastVsyncEventData.deadlineTimestamp;
-}
-
int64_t Choreographer::getFrameInterval() const {
return mLastVsyncEventData.frameInterval;
}
@@ -587,14 +577,6 @@
return AChoreographerFrameCallbackData_getFrameTimelineDeadline(data, index);
}
-int64_t AChoreographer_getVsyncId(const AChoreographer* choreographer) {
- return AChoreographer_to_Choreographer(choreographer)->getVsyncId();
-}
-
-int64_t AChoreographer_getFrameDeadline(const AChoreographer* choreographer) {
- return AChoreographer_to_Choreographer(choreographer)->getFrameDeadline();
-}
-
int64_t AChoreographer_getFrameInterval(const AChoreographer* choreographer) {
return AChoreographer_to_Choreographer(choreographer)->getFrameInterval();
}
diff --git a/libs/nativedisplay/include-private/private/android/choreographer.h b/libs/nativedisplay/include-private/private/android/choreographer.h
index 6e90853..4aa7e69 100644
--- a/libs/nativedisplay/include-private/private/android/choreographer.h
+++ b/libs/nativedisplay/include-private/private/android/choreographer.h
@@ -29,19 +29,6 @@
// for consumption by callbacks.
void AChoreographer_signalRefreshRateCallbacks(int64_t vsyncPeriod);
-// Returns the vsync id of the last frame callback. Client are expected to call
-// this function from their frame callback function to get the vsyncId and pass
-// it together with a buffer or transaction to the Surface Composer. Calling
-// this function from anywhere else will return an undefined value.
-int64_t AChoreographer_getVsyncId(const AChoreographer* choreographer);
-
-// Returns the deadline timestamp (in CLOCK_MONOTONIC) of the last frame callback.
-// Client are expected to call this function from their frame callback function
-// to get the deadline and use it to know whether a frame is likely to miss
-// presentation. Calling this function from anywhere else will return an undefined
-// value.
-int64_t AChoreographer_getFrameDeadline(const AChoreographer* choreographer);
-
// Returns the current interval in ns between frames.
// Client are expected to call this function from their frame callback function.
// Calling this function from anywhere else will return an undefined value.
diff --git a/libs/nativedisplay/libnativedisplay.map.txt b/libs/nativedisplay/libnativedisplay.map.txt
index b4a70e8..4dbfde8 100644
--- a/libs/nativedisplay/libnativedisplay.map.txt
+++ b/libs/nativedisplay/libnativedisplay.map.txt
@@ -43,8 +43,6 @@
android::AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTime*;
android::AChoreographerFrameCallbackData_routeGetFrameTimelineDeadline*;
android::AChoreographer_signalRefreshRateCallbacks*;
- android::AChoreographer_getVsyncId*;
- android::AChoreographer_getFrameDeadline*;
android::AChoreographer_getFrameInterval*;
android::ADisplay_acquirePhysicalDisplays*;
android::ADisplay_release*;