commit a16f767fb1b09596fecbfb201ea2c878d9440558
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 03 04:16:24 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 03 04:16:24 2016 -0700
tree f3067a67e559b67156bfd45de3ba7e7e66ba6535
parent 3353dc55fba7a2910d2874908a5f587490850e77
parent 7b505822fb6b3f51e5a188e681825b4ec50c3d36

Merge "power: Add mutex to camera hints"

power-8952.c

diff --git a/power-8952.c b/power-8952.c
index c205ab1..8a87c27 100644
--- a/power-8952.c
+++ b/power-8952.c
@@ -52,7 +52,7 @@
 static int display_hint_sent;
 static int video_encode_hint_sent;
 
-//static void process_video_encode_hint(void *metadata);
+static void process_video_encode_hint(void *metadata);
 
 int  power_hint_override(struct power_module *module, power_hint_t hint,
         void *data)
@@ -63,7 +63,7 @@
             break;
         case POWER_HINT_VIDEO_ENCODE:
         {
-            //process_video_encode_hint(data);
+            process_video_encode_hint(data);
             return HINT_HANDLED;
         }
     }
@@ -117,7 +117,7 @@
     saved_interactive_mode = !!on;
     return HINT_HANDLED;
 }
-#if 0
+
 /* Video Encode Hint */
 static void process_video_encode_hint(void *metadata)
 {
@@ -135,7 +135,7 @@
                             if (get_scaling_governor_check_cores(governor,
                                 sizeof(governor),CPU3) == -1) {
                                     ALOGE("Can't obtain scaling governor.");
-                                    return HINT_HANDLED;
+                                    return;
                             }
                     }
             }
@@ -192,4 +192,4 @@
     }
     return;
 }
-#endif
+

power.c

diff --git a/power.c b/power.c
index d3d23ec..1456405 100644
--- a/power.c
+++ b/power.c
@@ -236,7 +236,7 @@
     char governor[80];
     char tmp_str[NODE_MAX];
     struct video_encode_metadata_t video_encode_metadata;
-    int rc;
+    int rc = 0;
 
     if (set_interactive_override(module, on) == HINT_HANDLED) {
         return;