Merge "system: droidlogic-res should share with system_server process [1/1]" into o-amlogic

2 files changed, 2 insertions, 2 deletions

diff --git a/core/res/src/com/droidlogic/BootComplete.java b/core/res/src/com/droidlogic/BootComplete.java
index 688fd1c..24a461f 100644
--- a/core/res/src/com/droidlogic/BootComplete.java
+++ b/core/res/src/com/droidlogic/BootComplete.java
@@ -51,7 +51,7 @@ public class BootComplete extends BroadcastReceiver {
             final SystemControlManager sm = new SystemControlManager(context);
             //register system control callback
             sce = new SystemControlEvent(context);
-            sm.setListener(sce);
+            //sm.setListener(sce);
 
             final AudioManager audioManager = (AudioManager) context.getSystemService(context.AUDIO_SERVICE);
             final OutputModeManager outputModeManager = new OutputModeManager(context);
diff --git a/services/systemcontrol/SystemControlHal.cpp b/services/systemcontrol/SystemControlHal.cpp
index 7416622..02b3751 100644
--- a/services/systemcontrol/SystemControlHal.cpp
+++ b/services/systemcontrol/SystemControlHal.cpp
@@ -367,7 +367,7 @@ Return<void> SystemControlHal::setCallback(const sp<ISystemControlCallback>& cal
             ALOGW("Couldn't link death recipient for cookie: %d", cookie);
         }
 
-        ALOGI("%s cookie:%s, client size:%d", __FUNCTION__, cookie, (int)mClients.size());
+        ALOGI("%s cookie:%d, client size:%d", __FUNCTION__, cookie, (int)mClients.size());
     }
 
     return Void();