Merge "Revert "Placeholder for binder freeze notification API."" into main
diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp
index 6185b7b..c57c9cd 100644
--- a/libs/binder/Binder.cpp
+++ b/libs/binder/Binder.cpp
@@ -441,14 +441,6 @@
return INVALID_OPERATION;
}
-status_t BBinder::addFrozenStateChangeCallback(const wp<FrozenStateChangeCallback>&) {
- return INVALID_OPERATION;
-}
-
-status_t BBinder::removeFrozenStateChangeCallback(const wp<FrozenStateChangeCallback>&) {
- return INVALID_OPERATION;
-}
-
status_t BBinder::dump(int /*fd*/, const Vector<String16>& /*args*/)
{
return NO_ERROR;
diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp
index 59c5be7..6594aa6 100644
--- a/libs/binder/BpBinder.cpp
+++ b/libs/binder/BpBinder.cpp
@@ -557,14 +557,6 @@
}
}
-status_t BpBinder::addFrozenStateChangeCallback(const wp<FrozenStateChangeCallback>&) {
- return INVALID_OPERATION;
-}
-
-status_t BpBinder::removeFrozenStateChangeCallback(const wp<FrozenStateChangeCallback>&) {
- return INVALID_OPERATION;
-}
-
void BpBinder::reportOneDeath(const Obituary& obit)
{
sp<DeathRecipient> recipient = obit.recipient.promote();
diff --git a/libs/binder/include/binder/Binder.h b/libs/binder/include/binder/Binder.h
index 802a3bc..135be89 100644
--- a/libs/binder/include/binder/Binder.h
+++ b/libs/binder/include/binder/Binder.h
@@ -50,13 +50,6 @@
void* cookie = nullptr, uint32_t flags = 0,
wp<DeathRecipient>* outRecipient = nullptr);
- // Placeholders to test if adding virtual functions here breaks things.
- // Will be replaced by an actual API once things are verified to work.
- LIBBINDER_EXPORTED virtual status_t addFrozenStateChangeCallback(
- const wp<FrozenStateChangeCallback>& callback);
- LIBBINDER_EXPORTED virtual status_t removeFrozenStateChangeCallback(
- const wp<FrozenStateChangeCallback>& callback);
-
LIBBINDER_EXPORTED virtual void* attachObject(const void* objectID, void* object,
void* cleanupCookie,
object_cleanup_func func) final;
diff --git a/libs/binder/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h
index 0f52f6d..d7f74c4 100644
--- a/libs/binder/include/binder/BpBinder.h
+++ b/libs/binder/include/binder/BpBinder.h
@@ -66,12 +66,6 @@
void* cookie = nullptr, uint32_t flags = 0,
wp<DeathRecipient>* outRecipient = nullptr);
- [[nodiscard]] virtual status_t addFrozenStateChangeCallback(
- const wp<FrozenStateChangeCallback>& recipient);
-
- [[nodiscard]] virtual status_t removeFrozenStateChangeCallback(
- const wp<FrozenStateChangeCallback>& recipient);
-
LIBBINDER_EXPORTED virtual void* attachObject(const void* objectID, void* object,
void* cleanupCookie,
object_cleanup_func func) final;
diff --git a/libs/binder/include/binder/IBinder.h b/libs/binder/include/binder/IBinder.h
index 62d7354..17248ce 100644
--- a/libs/binder/include/binder/IBinder.h
+++ b/libs/binder/include/binder/IBinder.h
@@ -198,14 +198,9 @@
virtual void binderDied(const wp<IBinder>& who) = 0;
};
- class FrozenStateChangeCallback : public virtual RefBase {
- public:
- virtual void onStateChanged(const wp<IBinder>& who, bool isFrozen) = 0;
- };
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
+ #if defined(__clang__)
+ #pragma clang diagnostic pop
+ #endif
/**
* Register the @a recipient for a notification if this binder
@@ -254,12 +249,6 @@
uint32_t flags = 0,
wp<DeathRecipient>* outRecipient = nullptr) = 0;
- // Placeholders. See Binder.h for details.
- [[nodiscard]] virtual status_t addFrozenStateChangeCallback(
- const wp<FrozenStateChangeCallback>& callback) = 0;
- [[nodiscard]] virtual status_t removeFrozenStateChangeCallback(
- const wp<FrozenStateChangeCallback>& callback) = 0;
-
virtual bool checkSubclass(const void* subclassID) const;
typedef void (*object_cleanup_func)(const void* id, void* obj, void* cleanupCookie);