commit a50f61f8fa903117a6df82d164628de310f16ae9
author Jerome Gaillard <jgaillard@google.com> Tue Jan 26 12:40:51 2021 +0000
committer Jerome Gaillard <jgaillard@google.com> Tue Jan 26 12:40:51 2021 +0000
tree 9999cbdd78e82ebe9deaa0d3ae344380f6eced93
parent 675cb30f05907f6c509815365c9af58a8671fe4e

Revert "Fix build breakage."

This reverts commit 675cb30f05907f6c509815365c9af58a8671fe4e.

Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug

Change-Id: I82d228f2bc3e6b426d4703732e1c8766815ccc97

debuggerd/libdebuggerd/tombstone_proto.cpp

diff --git a/debuggerd/libdebuggerd/tombstone_proto.cpp b/debuggerd/libdebuggerd/tombstone_proto.cpp
index 801b112..17e401e 100644
--- a/debuggerd/libdebuggerd/tombstone_proto.cpp
+++ b/debuggerd/libdebuggerd/tombstone_proto.cpp
@@ -447,7 +447,7 @@
 
   if (process_info.has_fault_address) {
     sig.set_has_fault_address(true);
-    sig.set_fault_address(process_info.untagged_fault_address);
+    sig.set_fault_address(process_info.fault_address);
   }
 
   *result.mutable_signal_info() = sig;