commit 74d793867efb9fd3d687cb12c4c7b18e9dc0fa1a
author Eino-Ville Talvala <etalvala@google.com> Thu Jun 14 08:38:13 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 14 08:38:13 2012 -0700
tree 441b423cbfd884e315fc9667791a1f84a7bd0ccd
parent 186f8c526845a23a763f0eb827d1a3b8fccd6e60
parent fa7a91d3d2a7f99612446f61beb29cc9e215d0ba

Merge "Camera2: Add JPEG capture test."

include/hardware/audio.h

diff --git a/include/hardware/audio.h b/include/hardware/audio.h
index 9bd62aa..01d79b2 100644
--- a/include/hardware/audio.h
+++ b/include/hardware/audio.h
@@ -91,6 +91,9 @@
 /* A2DP sink address set by framework */
 #define AUDIO_PARAMETER_A2DP_SINK_ADDRESS "a2dp_sink_address"
 
+/* Screen state */
+#define AUDIO_PARAMETER_KEY_SCREEN_STATE "screen_state"
+
 /**
  *  audio stream parameters
  */

modules/gralloc/framebuffer.cpp

diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp
index a37e2c0..326f2ae 100644
--- a/modules/gralloc/framebuffer.cpp
+++ b/modules/gralloc/framebuffer.cpp
@@ -312,11 +312,6 @@
 {
     int status = -EINVAL;
     if (!strcmp(name, GRALLOC_HARDWARE_FB0)) {
-        alloc_device_t* gralloc_device;
-        status = gralloc_open(module, &gralloc_device);
-        if (status < 0)
-            return status;
-
         /* initialize our state here */
         fb_context_t *dev = (fb_context_t*)malloc(sizeof(*dev));
         memset(dev, 0, sizeof(*dev));