Reflect removal of vndservice_manager object classes.
(preemptive cherry-pick of commit: 0457f8e2a1615116c8054f02999673f7a655a278
to avoid merge conflict)
Bug: 34454312
Bug: 36052864
Test: policy builds
Change-Id: Icd92659fa62c040443e4f7a83926e7cf81c2eb93
diff --git a/sepolicy/hal_drm_default.te b/sepolicy/hal_drm_default.te
index 779425f..155ebec 100644
--- a/sepolicy/hal_drm_default.te
+++ b/sepolicy/hal_drm_default.te
@@ -1,5 +1,5 @@
# The Qualcomm DRM-HAL implementation uses a vendor-binder service provided
# by the HWC HAL.
vndbinder_use(hal_drm_default);
-allow hal_drm_default qdisplay_service:vndservice_manager { find };
+allow hal_drm_default qdisplay_service:service_manager { find };
binder_call(hal_drm_default, hal_graphics_composer)
diff --git a/sepolicy/hal_drm_widevine.te b/sepolicy/hal_drm_widevine.te
index 12a272c..622e500 100644
--- a/sepolicy/hal_drm_widevine.te
+++ b/sepolicy/hal_drm_widevine.te
@@ -11,5 +11,5 @@
# The Qualcomm DRM-HAL implementation uses a vendor-binder service provided
# by the HWC HAL.
vndbinder_use(hal_drm_widevine);
-allow hal_drm_widevine qdisplay_service:vndservice_manager { find };
+allow hal_drm_widevine qdisplay_service:service_manager { find };
binder_call(hal_drm_widevine, hal_graphics_composer)
diff --git a/sepolicy/hal_gnss_default.te b/sepolicy/hal_gnss_default.te
index 325907b..e26c174 100644
--- a/sepolicy/hal_gnss_default.te
+++ b/sepolicy/hal_gnss_default.te
@@ -1,6 +1,6 @@
vndbinder_use(hal_gnss_default)
binder_call(hal_gnss_default, per_mgr);
-allow hal_gnss_default per_mgr_service:vndservice_manager find;
+allow hal_gnss_default per_mgr_service:service_manager find;
#============= hal_gnss_default ==============
allow hal_gnss_default location_data_file:dir search;
diff --git a/sepolicy/per_mgr.te b/sepolicy/per_mgr.te
index 05761fe..a395289 100644
--- a/sepolicy/per_mgr.te
+++ b/sepolicy/per_mgr.te
@@ -6,7 +6,7 @@
init_daemon_domain(per_mgr)
-allow per_mgr per_mgr_service:vndservice_manager add;
+add_service(per_mgr, per_mgr_service)
vndbinder_use(per_mgr)
binder_call(per_mgr, rild)
diff --git a/sepolicy/per_proxy.te b/sepolicy/per_proxy.te
index 440915b..6728cf3 100644
--- a/sepolicy/per_proxy.te
+++ b/sepolicy/per_proxy.te
@@ -4,7 +4,7 @@
init_daemon_domain(per_proxy)
-allow per_proxy per_mgr_service:vndservice_manager find;
+allow per_proxy per_mgr_service:service_manager find;
r_dir_file(per_proxy, sysfs_type)
vndbinder_use(per_proxy)
diff --git a/sepolicy/rild.te b/sepolicy/rild.te
index 75adf35..7f9455e 100644
--- a/sepolicy/rild.te
+++ b/sepolicy/rild.te
@@ -1,7 +1,7 @@
# Grant access to Qualcomm MSM Interface (QMI) radio sockets
qmux_socket(rild)
-allow rild per_mgr_service:vndservice_manager find;
+allow rild per_mgr_service:service_manager find;
vndbinder_use(rild)
binder_call(rild, per_mgr)
