commit de2c43f8847849fc044c92b24f5f4b48391604d5
author Shawn Willden <swillden@google.com> Wed Jun 24 23:10:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 23:10:03 2015 +0000
tree 3a5e79b0899fb0abc6940af7af0dad4edfab1743
parent f75c57a808a70228c7fe8a3bff2f790c9ec2b9f1
parent 12fff70fbdfe9293072fa5061e148bf136d765ca

am 12fff70f: Merge "Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""" into mnc-dev

* commit '12fff70fbdfe9293072fa5061e148bf136d765ca':
  Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""

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) {