Merge "add internal APIs for user consent" into tizen accepted/tizen/unified/20170706.193143 submit/tizen/20170704.105114 submit/tizen/20170705.020445
authorjomui <jongmun.woo@samsung.com>
Tue, 4 Jul 2017 10:48:48 +0000 (10:48 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 4 Jul 2017 10:48:48 +0000 (10:48 +0000)
1  2 
src/api/maps_service.cpp
src/plugin/discovery.h
src/plugin/empty_module.cpp
src/plugin/module.cpp
src/plugin/module.h

Simple merge
@@@ -61,7 -60,8 +61,9 @@@ namespace plugi
  
        void user_consent_cb(bool consented, const char *provider, void *user_data);
        int request_user_consent(const char *maps_provider, void* callback, void *user_data);
+       int get_user_consent(const char *maps_provider, bool *consent);
+       int set_user_consent(const char *maps_provider, bool consent);
  }
 +//LCOV_EXCL_STOP
  
--#endif                                /* __MAPS_SERVICE_PLUGIN_DISCOVERY_H__ */
++#endif                                /* __MAPS_SERVICE_PLUGIN_DISCOVERY_H__ */
Simple merge
Simple merge
Simple merge