commit 25bff5c76efcac69b2773ff48392a9626149838f
author Shawn Willden <swillden@google.com> Mon Jul 27 21:18:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 27 21:18:07 2015 +0000
tree b682140486f073bd45a7115b347ddb02e7e88741
parent be103ec8c72908ba5bb2a76806f03a825878e353
parent afac8dd61e6f0554f24b6d4375b8eb426ea08884

am afac8dd6: am 70335f3d: Correct keymaster1 documentation.

* commit 'afac8dd61e6f0554f24b6d4375b8eb426ea08884':
  Correct keymaster1 documentation.

tests/camera2/ForkedTests.cpp

diff --git a/tests/camera2/ForkedTests.cpp b/tests/camera2/ForkedTests.cpp
index 315233e..39599da 100644
--- a/tests/camera2/ForkedTests.cpp
+++ b/tests/camera2/ForkedTests.cpp
@@ -16,6 +16,8 @@
 
 #include <gtest/gtest.h>
 
+#include <stdlib.h>
+
 #include "TestExtensions.h"
 
 namespace android {
@@ -37,9 +39,7 @@
 // intentionally fail
 TEST_F(DISABLED_ForkedTest, FailCrash) {
     TEST_EXTENSION_FORKING_INIT;
-
-    //intentionally crash
-    *(int*)0 = 0xDEADBEEF;
+    abort();
 }
 
 TEST_F(DISABLED_ForkedTest, SucceedNormal) {