Merge "[NAN-AWARE] Remove NAN service"

am: 0182a87d Change-Id: Iae511c7d37b80cb142ed2bafa8232920acc7c6ca

Merge "[NAN-AWARE] Remove NAN service"
2143eab8 · Etan Cohen · android-build-merger · 66502077 · 0182a87d · 2143eab8
Commit 2143eab8 authored 8 years ago by Etan Cohen Committed by android-build-merger 8 years ago
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -151,7 +151,6 @@ wifip2p                                   u:object_r:wifip2p_service:s0
 wifiscanner                               u:object_r:wifiscanner_service:s0
 wifi                                      u:object_r:wifi_service:s0
 wificond                                  u:object_r:wificond_service:s0
-wifinan                                   u:object_r:wifinan_service:s0
 wifiaware                                 u:object_r:wifiaware_service:s0
 window                                    u:object_r:window_service:s0
 wpa                                       u:object_r:wpa_supplicant_service:s0

--- a/public/service.te
+++ b/public/service.te
@@ -126,7 +126,6 @@ type wifip2p_service, app_api_service, system_server_service, service_manager_ty
 type wifiscanner_service, system_api_service, system_server_service, service_manager_type;
 type wifi_service, app_api_service, system_server_service, service_manager_type;
 type wificond_service, system_server_service, service_manager_type;
-type wifinan_service, app_api_service, system_server_service, service_manager_type;
 type wifiaware_service, app_api_service, system_server_service, service_manager_type;
 type window_service, system_api_service, system_server_service, service_manager_type;
 type wpa_supplicant_service, system_server_service, service_manager_type;