Merge change 21235 into eclair
* changes:
Change the number of volume steps from 6 to 7 per Verizon Requirements
diff --git a/include/private/ui/android_natives_priv.h b/include/private/ui/android_natives_priv.h
index ee843e9..9c92af8 100644
--- a/include/private/ui/android_natives_priv.h
+++ b/include/private/ui/android_natives_priv.h
@@ -25,7 +25,7 @@
/*****************************************************************************/
-struct android_native_buffer_t
+typedef struct android_native_buffer_t
{
#ifdef __cplusplus
android_native_buffer_t() {
@@ -48,7 +48,7 @@
buffer_handle_t handle;
void* reserved_proc[8];
-};
+} android_native_buffer_t;
/*****************************************************************************/
diff --git a/include/ui/ISurfaceComposer.h b/include/ui/ISurfaceComposer.h
index 1788265..25d954c 100644
--- a/include/ui/ISurfaceComposer.h
+++ b/include/ui/ISurfaceComposer.h
@@ -40,8 +40,6 @@
enum { // (keep in sync with Surface.java)
eHidden = 0x00000004,
- eGPU = 0x00000008,
- eHardware = 0x00000010,
eDestroyBackbuffer = 0x00000020,
eSecure = 0x00000080,
eNonPremultiplied = 0x00000100,
diff --git a/include/ui/egl/android_natives.h b/include/ui/egl/android_natives.h
index 4c58e47..363142c 100644
--- a/include/ui/egl/android_natives.h
+++ b/include/ui/egl/android_natives.h
@@ -43,7 +43,7 @@
// ---------------------------------------------------------------------------
-struct android_native_base_t
+typedef struct android_native_base_t
{
/* a magic value defined by the actual EGL native type */
int magic;
@@ -54,9 +54,9 @@
void* reserved[4];
/* reference-counting interface */
- void (*incRef)(struct android_native_base_t* base);
- void (*decRef)(struct android_native_base_t* base);
-};
+ void (*incRef)(android_native_base_t* base);
+ void (*decRef)(android_native_base_t* base);
+} android_native_base_t;
// ---------------------------------------------------------------------------
@@ -72,7 +72,7 @@
NATIVE_WINDOW_SET_USAGE = 0
};
-struct android_native_window_t
+typedef struct android_native_window_t
{
#ifdef __cplusplus
android_native_window_t()
@@ -108,7 +108,7 @@
*
* Returns 0 on success or -errno on error.
*/
- int (*setSwapInterval)(struct android_native_window_t* window,
+ int (*setSwapInterval)(android_native_window_t* window,
int interval);
/*
@@ -118,7 +118,7 @@
*
* Returns 0 on success or -errno on error.
*/
- int (*dequeueBuffer)(struct android_native_window_t* window,
+ int (*dequeueBuffer)(android_native_window_t* window,
struct android_native_buffer_t** buffer);
/*
@@ -128,7 +128,7 @@
*
* Returns 0 on success or -errno on error.
*/
- int (*lockBuffer)(struct android_native_window_t* window,
+ int (*lockBuffer)(android_native_window_t* window,
struct android_native_buffer_t* buffer);
/*
* hook called by EGL when modifications to the render buffer are done.
@@ -138,7 +138,7 @@
*
* Returns 0 on success or -errno on error.
*/
- int (*queueBuffer)(struct android_native_window_t* window,
+ int (*queueBuffer)(android_native_window_t* window,
struct android_native_buffer_t* buffer);
/*
@@ -146,7 +146,7 @@
*
* Returns 0 on success or -errno on error.
*/
- int (*query)(struct android_native_window_t* window,
+ int (*query)(android_native_window_t* window,
int what, int* value);
/*
@@ -162,11 +162,11 @@
*
*/
- int (*perform)(struct android_native_window_t* window,
+ int (*perform)(android_native_window_t* window,
int operation, ... );
void* reserved_proc[3];
-};
+} android_native_window_t;
/*
@@ -179,8 +179,8 @@
* reallocated.
*/
-inline int native_window_set_usage(
- struct android_native_window_t* window, int usage)
+static inline int native_window_set_usage(
+ android_native_window_t* window, int usage)
{
return window->perform(window, NATIVE_WINDOW_SET_USAGE, usage);
}
@@ -189,7 +189,7 @@
// ---------------------------------------------------------------------------
/* FIXME: this is legacy for pixmaps */
-struct egl_native_pixmap_t
+typedef struct egl_native_pixmap_t
{
int32_t version; /* must be 32 */
int32_t width;
@@ -203,7 +203,7 @@
int32_t vstride;
};
int32_t reserved;
-};
+} egl_native_pixmap_t;
/*****************************************************************************/
diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp
index 8c0b40d..ac4bf7b 100644
--- a/libs/surfaceflinger/Layer.cpp
+++ b/libs/surfaceflinger/Layer.cpp
@@ -109,9 +109,6 @@
if (err) return err;
uint32_t bufferFlags = 0;
- if (flags & ISurfaceComposer::eGPU)
- bufferFlags |= Buffer::GPU;
-
if (flags & ISurfaceComposer::eSecure)
bufferFlags |= Buffer::SECURE;
diff --git a/libs/surfaceflinger/LayerBitmap.h b/libs/surfaceflinger/LayerBitmap.h
index 48ee553..87e8f42 100644
--- a/libs/surfaceflinger/LayerBitmap.h
+++ b/libs/surfaceflinger/LayerBitmap.h
@@ -53,7 +53,6 @@
public:
enum {
DONT_CLEAR = 0x00000001,
- GPU = 0x00000002,
SECURE = 0x00000004
};
@@ -98,7 +97,6 @@
public:
enum {
DONT_CLEAR = Buffer::DONT_CLEAR,
- GPU = Buffer::GPU,
SECURE = Buffer::SECURE
};
LayerBitmap();