| commit | 9cd73e476e3eb6cf671743ff33db464a5e7df4f8 | [log] [tgz] |
|---|---|---|
| author | Andrew Walbran <qwandor@google.com> | Fri Feb 04 10:29:27 2022 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 04 10:29:27 2022 +0000 |
| tree | fb4648f6eafe0a16a92f5ff4282589fecaed0433 | |
| parent | af73f6fcc2278aae2a02663cace56dab54a3266d [diff] | |
| parent | d15c5630644f63e48adca221f3796351d2db5d50 [diff] |
Merge "Add DeathReason::CRASH and ERROR."
diff --git a/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java b/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java index 04a90e0..35d600a 100644 --- a/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java +++ b/javalib/src/android/system/virtualmachine/VirtualMachineConfig.java
@@ -206,6 +206,9 @@ // TODO(jiyong): should we treat APP_ONLY and FULL the same? return false; } + if (this.mProtectedVm != other.mProtectedVm) { + return false; + } return true; }
diff --git a/tests/aidl/Android.bp b/tests/aidl/Android.bp index 893ec0b..a2315ce 100644 --- a/tests/aidl/Android.bp +++ b/tests/aidl/Android.bp
@@ -9,7 +9,7 @@ backend: { java: { platform_apis: true, - gen_rpc: true, + require_rpc: true, }, cpp: { enabled: true,