Comment 6 for bug 1568123

Two issues in this bug:
- The error messages for thermal relationship tables: They are fine. All systems don't have that.
- For the other there was issue, which was fixed. I don't know if Colin picked up that or not. If the issue is still there even after this, let me know ASAP.

commit 4a890d7e173678644882e6b863f3650e30d33052
Author: Srinivas Pandruvada <email address hidden>
Date: Thu Feb 18 11:33:50 2016 -0800

    Regression for default config file

    f99f2b59fbbca04a13cad3f7d2dbc985bc7ee0cd caused regression
    where for Android the default path is changed to TDRUNDIR.
    This will cause issue to upgrade thermald.

    Thanks to Bruno Pagani "ArchangeGabriel" to identify and root
    causing this.

diff --git a/src/thd_parse.cpp b/src/thd_parse.cpp
index 7e8e84c..f73d43e 100644
--- a/src/thd_parse.cpp
+++ b/src/thd_parse.cpp
@@ -60,8 +60,13 @@ char *cthd_parse::char_trim(char *str) {

 cthd_parse::cthd_parse() :
                matched_thermal_info_index(-1), doc(NULL), root_element(NULL) {
+ std::string name_conf = TDCONFDIR;
        std::string name_run = TDRUNDIR;
+#ifdef ANDROID
        filename = name_run + "/" + "thermal-conf.xml";
+#else
+ filename = name_conf + "/" + "thermal-conf.xml";
+#endif
        filename_auto = name_run + "/" + "thermal-conf.xml.auto";
 }