Remove VNS traces
Bug: b/34361484
Test: manual
Change-Id: Ibf8aa93d83f1adc2f0e3b5121ab47b0455130545
diff --git a/car_product/init/init.bootstat.rc b/car_product/init/init.bootstat.rc
index 8c93d67..430a96b 100644
--- a/car_product/init/init.bootstat.rc
+++ b/car_product/init/init.bootstat.rc
@@ -29,8 +29,5 @@
on property:boot.car_service_created=1
exec - root root -- /system/bin/bootstat -r car_service_created
-on property:init.svc.vns=running
- exec - root root -- /system/bin/bootstat -r vns_running
-
on property:init.svc.zygote=running
exec - root root -- /system/bin/bootstat -r zygote_running
diff --git a/car_product/init/init.car.rc b/car_product/init/init.car.rc
index 9812d46..8cec36e 100644
--- a/car_product/init/init.car.rc
+++ b/car_product/init/init.car.rc
@@ -4,12 +4,5 @@
group root
critical
-service vns /system/bin/vehicle_network_service
- class core
- user system
- group system
- critical
-
on boot
- start vns
start vms
diff --git a/car_product/sepolicy/file_contexts b/car_product/sepolicy/file_contexts
index 2117818..904368d 100644
--- a/car_product/sepolicy/file_contexts
+++ b/car_product/sepolicy/file_contexts
@@ -2,7 +2,6 @@
###################################
# System files
#
-/system/bin/vehicle_network_service u:object_r:vns_exec:s0
/system/bin/vehicle_monitor_service u:object_r:vms_exec:s0
/system/bin/hw/android.hardware.automotive.vehicle@2.0-service u:object_r:hal_vehicle_exec:s0
diff --git a/car_product/sepolicy/system_app.te b/car_product/sepolicy/system_app.te
index 5dffcf2..384fd16 100644
--- a/car_product/sepolicy/system_app.te
+++ b/car_product/sepolicy/system_app.te
@@ -1,3 +1 @@
-binder_call(system_app, vns);
-
set_prop(system_app, car_prop)
diff --git a/car_product/sepolicy/vns.te b/car_product/sepolicy/vns.te
deleted file mode 100644
index 6d663f8..0000000
--- a/car_product/sepolicy/vns.te
+++ /dev/null
@@ -1,11 +0,0 @@
-# Vehicle network service
-type vns, domain;
-type vns_exec, exec_type, file_type;
-
-allow vns system_app:binder { call };
-allow vns car_service:service_manager { add };
-allow vns priv_app:binder { call };
-
-init_daemon_domain(vns)
-
-binder_use(vns);
diff --git a/tools/bootanalyze/config.yaml b/tools/bootanalyze/config.yaml
index fd925f0..1afcd60 100644
--- a/tools/bootanalyze/config.yaml
+++ b/tools/bootanalyze/config.yaml
@@ -30,7 +30,6 @@
zygote_preload_res_start: Zygote\s*:\s*Preloading resources...
zygote_preload_end: Zygote\s*:\s*end preload
zygote_create_system_server: Zygote\s*:\s*System server process [0-9]* has been created
- vns_start_by_init: Starting service 'vns'
SystemServer_start: Entered the Android system server!
system_server_ready: Enabled StrictMode for system server main
PackageManagerInit_start: SystemServer\s*:\s*StartPackageManagerService
diff --git a/vehicle_monitor_service/VehicleMonitorService.cpp b/vehicle_monitor_service/VehicleMonitorService.cpp
index 1ff251a..7368064 100644
--- a/vehicle_monitor_service/VehicleMonitorService.cpp
+++ b/vehicle_monitor_service/VehicleMonitorService.cpp
@@ -80,7 +80,7 @@
String8 msg;
if (!PermissionCache::checkCallingPermission(sDump)) {
msg.appendFormat("Permission Denial: "
- "can't dump VNS from pid=%d, uid=%d\n",
+ "can't dump VMS from pid=%d, uid=%d\n",
IPCThreadState::self()->getCallingPid(),
IPCThreadState::self()->getCallingUid());
write(fd, msg.string(), msg.size());