diff options
| author | Mathias Agopian <mathias@google.com> | 2010-02-12 14:04:35 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-02-12 14:04:35 -0800 |
| commit | 128ce4b24ad0ee2c2ed56af9a0d800d7dc6111c0 (patch) | |
| tree | f777da7ff4020a608a97e071a4bada2917cd8ec8 /libs | |
| parent | 5cbb940cf6b1fd2b44d66bc40e5c3e8429bbd741 (diff) | |
| download | frameworks_base-128ce4b24ad0ee2c2ed56af9a0d800d7dc6111c0.zip frameworks_base-128ce4b24ad0ee2c2ed56af9a0d800d7dc6111c0.tar.gz frameworks_base-128ce4b24ad0ee2c2ed56af9a0d800d7dc6111c0.tar.bz2 | |
real fix for [2440014] launcher2 crashing in loop during boot
Surface* cannot be casted to void* and then to android_native_window_t*
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/rs/rs.spec | 2 | ||||
| -rw-r--r-- | libs/rs/rsContext.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/rs/rs.spec b/libs/rs/rs.spec index ac115d3..10e5285 100644 --- a/libs/rs/rs.spec +++ b/libs/rs/rs.spec @@ -29,7 +29,7 @@ ContextResume { ContextSetSurface { param uint32_t width param uint32_t height - param void *sur + param android_native_window_t *sur } ContextDump { diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index e94aece..dec993a 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -857,9 +857,9 @@ void rsi_ContextResume(Context *rsc) rsc->resume(); } -void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, void *sur) +void rsi_ContextSetSurface(Context *rsc, uint32_t w, uint32_t h, android_native_window_t *sur) { - rsc->setSurface(w, h, (android_native_window_t *)sur); + rsc->setSurface(w, h, sur); } void rsi_ContextSetPriority(Context *rsc, int32_t p) |