Merge "[NAN-AWARE] Add Aware service"

am: 8da9cd64 Change-Id: I3b249385f40083bc598784e0b27b91d42fdec16b

Merge "[NAN-AWARE] Add Aware service"
66502077 · Etan Cohen · android-build-merger · 84992ead · 8da9cd64 · 66502077
Commit 66502077 authored 8 years ago by Etan Cohen Committed by android-build-merger 8 years ago
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -152,6 +152,7 @@ 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
 *                                         u:object_r:default_android_service:s0
--- a/public/service.te
+++ b/public/service.te
@@ -127,5 +127,6 @@ type wifiscanner_service, system_api_service, system_server_service, service_man
 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;