commit c5398d2c22401104f912eeda6acda0cc02d9fa89
author Steven Moreland <smoreland@google.com> Mon Aug 12 18:19:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 12 18:19:01 2019 -0700
tree 553cb545fba0993621fb2a7751e5b024aed408ee
parent 7d71de036919838b3931ff180e64c3ba9f21eb13
parent 499d257f06106ba6d454efabe8fd54975ff2a415

Merge "libbinder: can't remark binder stability" am: 87cf89ca6a am: 3e4b252fde
am: 499d257f06

Change-Id: I5509164899f0712fdc3e0bd8d1f3e1e3044f298d

libs/binder/tests/binderStabilityTest.cpp

diff --git a/libs/binder/tests/binderStabilityTest.cpp b/libs/binder/tests/binderStabilityTest.cpp
index 490850e..0336b9e 100644
--- a/libs/binder/tests/binderStabilityTest.cpp
+++ b/libs/binder/tests/binderStabilityTest.cpp
@@ -275,6 +275,14 @@
     ASSERT_TRUE(MarksStabilityInConstructor::gDestructed);
 }
 
+TEST(BinderStability, RemarkDies) {
+    ASSERT_DEATH({
+        sp<IBinder> binder = new BBinder();
+        Stability::markCompilationUnit(binder.get()); // <-- only called for tests
+        Stability::markVndk(binder.get()); // <-- only called for tests
+    }, "Should only mark known object.");
+}
+
 int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);