Merge "Run virtmanager with its new UID"
diff --git a/authfs/src/file/remote_file.rs b/authfs/src/file/remote_file.rs
index f2ac23f..9d614f5 100644
--- a/authfs/src/file/remote_file.rs
+++ b/authfs/src/file/remote_file.rs
@@ -41,8 +41,9 @@
.unwrap()
.readFile(remote_fd, offset, buf.len() as i32)
.map_err(|e| io::Error::new(io::ErrorKind::Other, e.get_description()))?;
- buf.copy_from_slice(&chunk);
- Ok(min(buf.len(), chunk.len()))
+ let size = min(buf.len(), chunk.len());
+ buf[..size].copy_from_slice(&chunk[..size]);
+ Ok(size)
}
pub struct RemoteFileReader {
@@ -87,8 +88,9 @@
.unwrap()
.readFsverityMerkleTree(self.file_fd, offset, buf.len() as i32)
.map_err(|e| io::Error::new(io::ErrorKind::Other, e.get_description()))?;
- buf.copy_from_slice(&chunk);
- Ok(min(buf.len(), chunk.len()))
+ let size = min(buf.len(), chunk.len());
+ buf[..size].copy_from_slice(&chunk[..size]);
+ Ok(size)
}
}
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index f853b75..81eb48c 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -157,9 +157,7 @@
"printk.devkmsg=on " +
"androidboot.first_stage_console=1 " +
"androidboot.hardware=microdroid " +
- "androidboot.boot_devices=10000.pci " +
- // TODO(b/181747352) remove this to enforce selinux
- "androidboot.selinux=permissive",
+ "androidboot.boot_devices=10000.pci ",
dtb_prebuilt: "dummy_dtb.img",
header_version: "4",
partition_name: "boot",