Merge "[Application] Implementation for method getBatteryUsageInfo" into tizen
authorPiotr Kosko <p.kosko@samsung.com>
Wed, 10 May 2017 06:45:58 +0000 (06:45 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 10 May 2017 06:45:58 +0000 (06:45 +0000)
1  2 
packaging/webapi-plugins.spec
src/application/application_api.js
src/application/application_instance.cc
src/application/application_instance.h
src/application/application_manager.cc
src/application/application_manager.h

Simple merge
Simple merge
@@@ -59,10 -60,9 +60,11 @@@ ApplicationInstance::ApplicationInstanc
    REGISTER_SYNC("ApplicationManager_getAppCerts", GetAppCerts);
    REGISTER_SYNC("ApplicationManager_getAppSharedURI", GetAppSharedURI);
    REGISTER_SYNC("ApplicationManager_getAppMetaData", GetAppMetaData);
+   REGISTER_SYNC("ApplicationManager_getBatteryUsageInfo", GetBatteryUsageInfo);
    REGISTER_SYNC("ApplicationManager_addAppInfoEventListener", AddAppInfoEventListener);
    REGISTER_SYNC("ApplicationManager_removeAppInfoEventListener", RemoveAppInfoEventListener);
 +  REGISTER_SYNC("ApplicationManager_addAppStatusChangeListener", AddStatusListener);
 +  REGISTER_SYNC("ApplicationManager_removeStatusChangeListener", RemoveStatusListener);
  
    //Application
    REGISTER_SYNC("Application_getRequestedAppControl", GetRequestedAppControl);
Simple merge