PolicyManager manage layout information (area, category, role)

Change-Id: I0841819ef73a20308223414bca8d74f5b26215f5
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

2 files changed, 34 insertions, 11 deletions

diff --git a/src/policy_manager/zipc/dummy_stm.c b/src/policy_manager/zipc/dummy_stm.c
index 4d8b057..a53d28f 100644
--- a/src/policy_manager/zipc/dummy_stm.c
+++ b/src/policy_manager/zipc/dummy_stm.c
@@ -39,6 +39,7 @@ const int gStmEventNo[] = {
 };
 
 const char* gStmCategoryName[] = {
+    "none",
     "homescreen",
     "map",
     "general",
@@ -49,6 +50,7 @@ const char* gStmCategoryName[] = {
 };
 
 const int gStmCategoryNo[] = {
+    STM_CTG_NO_NONE,
     STM_CTG_NO_HOMESCREEN,
     STM_CTG_NO_MAP,
     STM_CTG_NO_GENERAL,
@@ -132,7 +134,8 @@ const char* gStmLayoutNo2Name[] = {
     "restriction.split.sub",
 };
 
-const char* gStmLayerNo2Name[] = {
+const char* gStmLayerName[] = {
+    "none",
     "homescreen",
     "apps",
     "restriction",
diff --git a/src/policy_manager/zipc/dummy_stm.h b/src/policy_manager/zipc/dummy_stm.h
index c0011f3..c94e8e0 100644
--- a/src/policy_manager/zipc/dummy_stm.h
+++ b/src/policy_manager/zipc/dummy_stm.h
@@ -41,13 +41,14 @@
 #define STM_EVT_NO_RESTRICTION_MODE_ON   0x0F
 
 // Category number
-#define STM_CTG_NO_HOMESCREEN   0x0100
-#define STM_CTG_NO_MAP          0x0200
-#define STM_CTG_NO_GENERAL      0x0300
-#define STM_CTG_NO_SPLITABLE    0x0400
-#define STM_CTG_NO_POPUP        0x0500
-#define STM_CTG_NO_SYSTEM_ALERT 0x0600
-#define STM_CTG_NO_RESTRICTION  0x0700
+#define STM_CTG_NO_NONE         0x0100
+#define STM_CTG_NO_HOMESCREEN   0x0200
+#define STM_CTG_NO_MAP          0x0300
+#define STM_CTG_NO_GENERAL      0x0400
+#define STM_CTG_NO_SPLITABLE    0x0500
+#define STM_CTG_NO_POPUP        0x0600
+#define STM_CTG_NO_SYSTEM_ALERT 0x0700
+#define STM_CTG_NO_RESTRICTION  0x0800
 
 // Area number
 #define STM_ARA_NO_FULL                   0x010000
@@ -66,7 +67,7 @@
 
 // Number of events, categories and areas
 #define STM_NUM_EVT 15
-#define STM_NUM_CTG  7
+//#define STM_NUM_CTG  7
 #define STM_NUM_ARA  8
 
 // Enum for state
@@ -121,13 +122,33 @@ enum stm_layout_ {
     gStmLayoutNoRestrictionSplitSub,
 };
 
+enum stm_category_ {
+    gStmCategoryNoNone = 0,
+    gStmCategoryNoHomescreen,
+    gStmCategoryNoMap,
+    gStmCategoryNoGeneral,
+    gStmCategoryNoSplitable,
+    gStmCategoryNoPopup,
+    gStmCategoryNoSystemAlert,
+    gStmCategoryNoRestriction,
+
+    gStmCategoryNoNum,
+
+    gStmCategoryNoMin = gStmCategoryNoNone,
+    gStmCategoryNoMax = gStmCategoryNoNum - 1,
+};
+
 enum stm_layer_ {
-    gStmLayerNoHomescreen = 0,
+    gStmLayerNoNone = 0,
+    gStmLayerNoHomescreen,
     gStmLayerNoApps,
     gStmLayerNoRestriction,
     gStmLayerNoOnScreen,
 
     gStmLayerNoNum,
+
+    gStmLayerNoMin = gStmLayerNoNone,
+    gStmLayerNoMax = gStmLayerNoNum - 1,
 };
 
 extern const char* gStmEventName[];
@@ -137,7 +158,6 @@ extern const int gStmCategoryNo[];
 extern const char* gStmAreaName[];
 extern const int gStmAreaNo[];
 extern const char* gStmLayerName[];
-extern const int gStmLayerNo[];
 
 // String for state
 extern const char* gStmParkingBrakeStateNo2Name[];