Add hw.keyboard.lid

This is used to control the lid switch virtual device.

+ Add support for a "version <number>" field to the skin format.
  This will later be used for skin format #3.

+ Fix a bug where string hw properties didn't work/compile

Change-Id: I678a0988d2cd24169dd0c2ece96e7ab0b2822104

3 files changed, 21 insertions, 4 deletions

diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini
index a936603..89acf9f 100644
--- a/android/avd/hardware-properties.ini
+++ b/android/avd/hardware-properties.ini
@@ -53,6 +53,16 @@ default     = yes
 abstract    = Keyboard support
 description = Whether the device has a QWERTY keyboard.
 
+# Keyboard lid support
+# (I.e. can the qwerty keyboard be closed/hidden or opened/visible)
+# this will be ignored if hw.keyboard is false
+#
+name        = hw.keyboard.lid
+type        = boolean
+default     = yes
+abstract    = Keyboard lid support
+description = Whether the QWERTY keyboard can be opened/closed.
+
 # DPad keys
 name        = hw.dPad
 type        = boolean
diff --git a/android/avd/hw-config-defs.h b/android/avd/hw-config-defs.h
index 5f97a25..4afc4d7 100644
--- a/android/avd/hw-config-defs.h
+++ b/android/avd/hw-config-defs.h
@@ -46,6 +46,13 @@ HWCFG_BOOL(
   "Whether the device has a QWERTY keyboard.")
 
 HWCFG_BOOL(
+  hw_keyboard_lid,
+  "hw.keyboard.lid",
+  "yes",
+  "Keyboard lid support",
+  "Whether the QWERTY keyboard can be opened/closed.")
+
+HWCFG_BOOL(
   hw_dPad,
   "hw.dPad",
   "yes",
diff --git a/android/avd/info.c b/android/avd/info.c
index 7aa3b22..e3d38bb 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -268,7 +268,7 @@ _getSearchPaths( AvdInfo*  i )
         if (p >= end)
             continue;
 
-        path = iniFile_getString( i->configIni, temp );
+        path = iniFile_getString( i->configIni, temp, NULL );
         if (path != NULL) {
             DD("    found image search path: %s", path);
             if (!path_is_absolute(path)) {
@@ -331,7 +331,7 @@ _getRootIni( AvdInfo*  i )
 static int
 _getContentPath( AvdInfo*  i )
 {
-    i->contentPath = iniFile_getString(i->rootIni, ROOT_PATH_KEY);
+    i->contentPath = iniFile_getString(i->rootIni, ROOT_PATH_KEY, NULL);
 
     if (i->contentPath == NULL) {
         derror("bad config: %s",
@@ -986,7 +986,7 @@ _getSkin( AvdInfo*  i, AvdInfoParams*  params )
     if (params->skinName) {
         skinName = ASTRDUP(params->skinName);
     } else {
-        skinName = iniFile_getString( i->configIni, SKIN_PATH );
+        skinName = iniFile_getString( i->configIni, SKIN_PATH, NULL );
         explicitSkin = 0;
     }
 
@@ -1089,7 +1089,7 @@ _getSDCardPath( AvdInfo*  i, AvdInfoParams*  params )
     if (params->forcePaths[AVD_IMAGE_SDCARD] != NULL)
         return;
 
-    path = iniFile_getString(i->configIni, SDCARD_PATH);
+    path = iniFile_getString(i->configIni, SDCARD_PATH, NULL);
     if (path == NULL)
         return;