From 27114f21cc1964cecad7686cdd8ff7be7d055968 Mon Sep 17 00:00:00 2001
From: Bhavna Sharma <sbhavna@codeaurora.org>
Date: Wed, 13 Jun 2018 15:10:43 -0700
Subject: [PATCH] Changed to allow only locclient group to access hal daemon

Move hal daemon socket creation to loc_client directory
Define uid/gid for locclient

CRs-Fixed: 2260194

Change-Id: Icaac885c19cd65b11254bb93b6a938b2d4595761
---
 pla/android/loc_pla.h  | 2 ++
 pla/oe/loc_pla.h       | 2 ++
 utils/gps_extended_c.h | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pla/android/loc_pla.h b/pla/android/loc_pla.h
index 6b38fa73..43a09067 100644
--- a/pla/android/loc_pla.h
+++ b/pla/android/loc_pla.h
@@ -45,6 +45,8 @@ extern "C" {
 
 #define UID_GPS (AID_GPS)
 #define GID_GPS (AID_GPS)
+#define UID_LOCCLIENT (4021)
+#define GID_LOCCLIENT (4021)
 
 #define LOC_PATH_GPS_CONF_STR      "/vendor/etc/gps.conf"
 #define LOC_PATH_IZAT_CONF_STR     "/vendor/etc/izat.conf"
diff --git a/pla/oe/loc_pla.h b/pla/oe/loc_pla.h
index 094e3f33..94468881 100644
--- a/pla/oe/loc_pla.h
+++ b/pla/oe/loc_pla.h
@@ -64,6 +64,8 @@ extern "C" {
 
 #define UID_GPS (1021)
 #define GID_GPS (1021)
+#define UID_LOCCLIENT (4021)
+#define GID_LOCCLIENT (4021)
 
 #define LOC_PATH_GPS_CONF_STR      "/etc/gps.conf"
 #define LOC_PATH_IZAT_CONF_STR     "/etc/izat.conf"
diff --git a/utils/gps_extended_c.h b/utils/gps_extended_c.h
index b7c25a7f..cd1ce070 100644
--- a/utils/gps_extended_c.h
+++ b/utils/gps_extended_c.h
@@ -1574,7 +1574,7 @@ typedef void (*LocAgpsCloseResultCb)(bool isSuccess, AGpsExtType agpsType, void*
 
 #define SOCKET_DIR_LOCATION            "/dev/socket/location/"
 #define SOCKET_DIR_EHUB                "/dev/socket/location/ehub/"
-#define SOCKET_TO_LOCATION_HAL_DAEMON  "/dev/socket/location/hal_daemon"
+#define SOCKET_TO_LOCATION_HAL_DAEMON  "/dev/socket/loc_client/hal_daemon"
 
 #define SOCKET_DIR_TO_CLIENT           "/dev/socket/loc_client/"
 #define SOCKET_TO_LOCATION_CLIENT_BASE "/dev/socket/loc_client/toclient"