Snap for 12602378 from 829e94415d8df89c0914489516c9a4f662206f49 to 25Q1-release
Change-Id: I2176b3691ef3a908768fabdb501e6ca3f9d6c69e
diff --git a/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp b/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
index ddefb9f..7c820f3 100644
--- a/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
@@ -311,6 +311,11 @@
}
std::string response = Receivemsg();
+ // If server socket disconnects most likely because of device reboot,
+ // then we just return 0.
+ if (response.empty()) {
+ return 0.0;
+ }
return std::stod(response);
}
diff --git a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc
index 2799188..ca6132e 100644
--- a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc
+++ b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc
@@ -12,6 +12,6 @@
# TODO(b/357821690): Start the KeyMint HALs when the KeyMint VM is ready once the Trusty VM
# has a mechanism to notify the host.
on late-fs && property:ro.hardware.security.keymint.trusty.system=1 && \
- property:trusty_vm_system.vm_cid=*
- setprop system.keymint.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1
+ property:trusty.security_vm.vm_cid=*
+ setprop system.keymint.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1
start system.keymint.rust-trusty.nonsecure
diff --git a/trusty/utils/rpmb_dev/rpmb_dev.system.rc b/trusty/utils/rpmb_dev/rpmb_dev.system.rc
index b78c4e2..52419ed 100644
--- a/trusty/utils/rpmb_dev/rpmb_dev.system.rc
+++ b/trusty/utils/rpmb_dev/rpmb_dev.system.rc
@@ -24,7 +24,7 @@
# storageproxyd
on late-fs && \
- property:trusty_vm_system_nonsecure.ready=1 && \
+ property:trusty.security_vm.nonsecure_vm_ready=1 && \
property:storageproxyd_system.trusty_ipc_dev=*
wait /dev/socket/rpmb_mock_system
start storageproxyd_system
@@ -32,8 +32,8 @@
# RPMB Mock
on post-fs && \
- property:trusty_vm_system_nonsecure.ready=1 && \
- property:trusty_vm_system.vm_cid=*
+ property:trusty.security_vm.nonsecure_vm_ready=1 && \
+ property:trusty.security_vm.vm_cid=*
# Create a persistent location for the RPMB data
# (work around lack of RPMb block device on CF).
# file contexts secure_storage_rpmb_system_file
@@ -49,12 +49,12 @@
mkdir /mnt/secure_storage_persist_system 0770 system system
symlink /metadata/secure_storage_persist_system \
/mnt/secure_storage_persist_system/persist
- setprop storageproxyd_system.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1
+ setprop storageproxyd_system.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1
exec_start rpmb_mock_init_system
start rpmb_mock_system
on post-fs-data && \
- property:trusty_vm_system_nonsecure.ready=1 && \
+ property:trusty.security_vm.nonsecure_vm_ready=1 && \
property:storageproxyd_system.trusty_ipc_dev=*
# file contexts secure_storage_system_file
mkdir /data/secure_storage_system 0770 root system