[Power][Common] Calling "lockstate" instead "lockstate_nopt"

Native API reverted its changes. Now we should call "lockstate" again.
With this change API can request DIM brightness again.

[Native changes]
https://review.tizen.org/gerrit/#/c/159981/
https://review.tizen.org/gerrit/#/c/159994/
https://review.tizen.org/gerrit/#/c/159993/
https://review.tizen.org/gerrit/#/c/159980/

[Verification] 100% pass rate on power manual and automatic tests

Change-Id: I2ec53da7d9f79d5f583603a0f75f3fd7ce35fb91
Signed-off-by: Michal Bistyga <m.bistyga@samsung.com>

diff --git a/src/common/GDBus/auto_gen_interface.c b/src/common/GDBus/auto_gen_interface.c
index 8835000042439836133ebf2043ef8ee11d701e78..10ccc8a66540bc9186397b703fb2940d4eea2ec5 100644 (file)
--- a/src/common/GDBus/auto_gen_interface.c
+++ b/src/common/GDBus/auto_gen_interface.c
@@ -755,7 +755,7 @@ _out:
  * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
  */
 gboolean
-_auto_gen_org_tizen_system_deviced_display_call_lockstate_nopt_sync (
+_auto_gen_org_tizen_system_deviced_display_call_lockstate_sync (
     _auto_genOrgTizenSystemDevicedDisplay *proxy,
     const gchar *arg_state,
     const gchar *arg_option1,
@@ -767,8 +767,8 @@ _auto_gen_org_tizen_system_deviced_display_call_lockstate_nopt_sync (
 {
   GVariant *_ret;
   _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "lockstate_nopt", //Since Tizen 4.0 we call "lockstate_nopt" method
-                      //because "lockstate" requires additional privilege
+    "lockstate",    //We used lockstate_nopt for tizen_4.0 but privillige for
+                    //lockstate has been reverted and duplicated method has been removed
     g_variant_new ("(sssi)",
                    arg_state,
                    arg_option1,

diff --git a/src/common/GDBus/auto_gen_interface.h b/src/common/GDBus/auto_gen_interface.h
index 04a0a076bcfd7f49613fade7a13e65d3902f4166..c90e84fb3875505035449df98817525a411c0c88 100644 (file)
--- a/src/common/GDBus/auto_gen_interface.h
+++ b/src/common/GDBus/auto_gen_interface.h
@@ -90,7 +90,7 @@ gboolean _auto_gen_org_tizen_system_deviced_display_call_lockstate_finish(
     _auto_genOrgTizenSystemDevicedDisplay *proxy, gint *out_result, GAsyncResult *res,
     GError **error);
 
-gboolean _auto_gen_org_tizen_system_deviced_display_call_lockstate_nopt_sync(
+gboolean _auto_gen_org_tizen_system_deviced_display_call_lockstate_sync(
     _auto_genOrgTizenSystemDevicedDisplay *proxy, const gchar *arg_state, const gchar *arg_option1,
     const gchar *arg_option2, gint arg_timeout, gint *out_result, GCancellable *cancellable,
     GError **error);

diff --git a/src/common/GDBus/gdbus_powerwrapper.cc b/src/common/GDBus/gdbus_powerwrapper.cc
index d17a75db5c50bda64174d29dc291c00a3793e785..f280ab4910999ed18329743062a7ee8610d33ab7 100644 (file)
--- a/src/common/GDBus/gdbus_powerwrapper.cc
+++ b/src/common/GDBus/gdbus_powerwrapper.cc
@@ -153,7 +153,7 @@ bool GDBusPowerWrapper::LockStateRaw(const std::string &state, const std::string
   const gint _timeout = static_cast<gint>(timeout);
 
   gint out_result;
-  gboolean ret = _auto_gen_org_tizen_system_deviced_display_call_lockstate_nopt_sync(
+  gboolean ret = _auto_gen_org_tizen_system_deviced_display_call_lockstate_sync(
       proxy_, arg_state, arg_option1, arg_option2, _timeout, &out_result, NULL, &error);
   if (!ret) {
     err_->ReportError(error);