Merge "Set stability for unset interfaces."

1 files changed, 4 insertions, 2 deletions

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 51ca7b4f02..a2333ae07e 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -167,6 +167,8 @@ static void release_object(const sp<ProcessState>& proc,
 status_t Parcel::finishFlattenBinder(
     const sp<IBinder>& /*binder*/, const flat_binder_object& flat)
 {
+    // internal::Stability::tryMarkCompilationUnit(binder.get());
+
     status_t status = writeObject(flat, false);
     if (status != OK) return status;
 
@@ -183,11 +185,11 @@ status_t Parcel::finishUnflattenBinder(
     // status_t status = readInt32(&stability);
     // if (status != OK) return status;
 
-    // if (!internal::Stability::check(stability, mRequiredStability)) {
+    // if (binder != nullptr && !internal::Stability::check(stability, mRequiredStability)) {
     //     return BAD_TYPE;
     // }
 
-    // status = internal::Stability::set(binder.get(), stability);
+    // status = internal::Stability::set(binder.get(), stability, true /*log*/);
     // if (status != OK) return status;
 
     *out = binder;