4135 Commits

Author SHA1 Message Date
Mathias Agopian
947f4f4d38 merge master to master_gl 2009-05-22 02:16:08 -07:00
Android (Google) Code Review
e755d64977 am 69a6c3eb: Merge change 2292 into donut
Merge commit '69a6c3ebd46a8de0e896747757f364322c12608d'

* commit '69a6c3ebd46a8de0e896747757f364322c12608d':
  split boot animation out of SurfaceFlinger
2009-05-21 19:36:53 -07:00
Mathias Agopian
627e7b50be split boot animation out of SurfaceFlinger
Conflicts:

	data/etc/platform.xml
2009-05-21 19:21:59 -07:00
Mathias Agopian
dfece80c79 change 2115 wasn't merged properly into master. this fixes that.
Merge change 2115 into donut

* changes:
  bring the native_handle stuff back from master_gl

Conflicts:

	libs/binder/Parcel.cpp
2009-05-21 16:29:38 -07:00
Mathias Agopian
9890815e42 bring the native_handle stuff back from master_gl 2009-05-20 14:33:23 -07:00
Mathias Agopian
0795272aa2 move libbinder's header files under includes/binder 2009-05-20 12:55:03 -07:00
Mathias Agopian
25ba5b6564 checkpoint: split libutils into libutils + libbinder 2009-05-20 12:55:02 -07:00
Android (Google) Code Review
bad962bf40 am e2914615: Merge change 2099 into donut
Merge commit 'e29146158b6048936671decc060d398a68333fc0'

* commit 'e29146158b6048936671decc060d398a68333fc0':
  Hook up the backup data writer, and add a utility to read the backup data files.
2009-05-20 11:58:08 -07:00
Joe Onorato
d2110dbce0 Hook up the backup data writer, and add a utility to read the backup data files. 2009-05-20 11:24:20 -07:00
Android (Google) Code Review
82d8030c8e am eb2c314b: Merge change 2042 into donut
Merge commit 'eb2c314b4d31c44af8a27ef51120b33290e65837'

* commit 'eb2c314b4d31c44af8a27ef51120b33290e65837':
  Remove deprecated openInputStream factory method
2009-05-20 08:54:45 -07:00
Android (Google) Code Review
d131275a81 am a59aba8c: Merge changes 2023,2036 into donut
Merge commit 'a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8'

* commit 'a59aba8cd88b8f98fa4de2a903899bc6ac9f73e8':
  Update more references to openInputStream in support classes.
  Modify AudioFlinger to use updated openInputStream factory method.
2009-05-20 08:54:45 -07:00
Android (Google) Code Review
352ea0e1d2 am f6382011: Merge change 1998 into donut
Merge commit 'f638201182818f9e4041c6a862a297c6723240c0'

* commit 'f638201182818f9e4041c6a862a297c6723240c0':
  Add inputSource to openInputStream
2009-05-20 08:54:44 -07:00
Dave Sparks
fe9f0722b0 Remove deprecated openInputStream factory method 2009-05-19 18:56:13 -07:00
Dave Sparks
a5e2ef0af0 Update more references to openInputStream in support classes.
Continuation of bug 1846343
2009-05-19 18:28:20 -07:00
Dave Sparks
356d8a34bf Modify AudioFlinger to use updated openInputStream factory method.
Continuation of bug 1846343
2009-05-19 16:41:29 -07:00
Dave Sparks
ad216e51b3 Add inputSource to openInputStream
Continuation of bug 1846343
2009-05-19 14:38:46 -07:00
Android (Google) Code Review
f1f12f8cfc am 656a2726: Merge change 1910 into donut
Merge commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'

* commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
  Update aapt badging for native code, configs, density, etc.
2009-05-18 23:56:07 -07:00
Dianne Hackborn
bb9ea30ea9 Update aapt badging for native code, configs, density, etc. 2009-05-18 15:22:00 -07:00
Mathias Agopian
6158b1bf03 Region now has its own implementation instead of relying on SkRegion, which allows us to break libui's dependency on libcorecg. 2009-05-17 23:34:16 -07:00
Android (Google) Code Review
28a6f667c2 am e85bb9eb: Merge change 1823 into donut
Merge commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727'

* commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727':
  Add the backup data file writer C++ class.
2009-05-15 16:25:41 -07:00
Mathias Agopian
59aa044a10 Merge branch '2514' into merge_master 2009-05-15 15:44:41 -07:00
Joe Onorato
2e1da32203 Add the backup data file writer C++ class. 2009-05-15 18:20:19 -04:00
Joe Onorato
55051ebdd1 am 4535e405: Implement the C++ class to write the backed up file data.
Merge commit '4535e40544aeb957d44fad75fbe5676effe03689'

* commit '4535e40544aeb957d44fad75fbe5676effe03689':
  Implement the C++ class to write the backed up file data.
2009-05-15 07:55:51 -07:00
Joe Onorato
4535e40544 Implement the C++ class to write the backed up file data. 2009-05-15 10:37:10 -04:00
Mathias Agopian
11abc8a36d Merge commit 'goog/master' into merge_master
Conflicts:
	opengl/libagl/Android.mk
	opengl/libs/Android.mk
	opengl/libs/egl_impl.h
2009-05-14 22:44:23 -07:00
Android (Google) Code Review
a64b860749 am aa642c0c: Merge changes 1591,1596 into donut
Merge commit 'aa642c0cc20293137376d44f8221876c121e5be9'

* commit 'aa642c0cc20293137376d44f8221876c121e5be9':
  Get the backup calling through to the file backup helper.
  Fix typos.
  Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
  Fixes #1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
  Add Intent.ACTION_APP_ERROR
2009-05-14 14:53:27 -07:00
Joe Onorato
290bb011c5 Get the backup calling through to the file backup helper.
This includes some cleanup to make the parameters match
between BackupService.onBackup and FileBackupHelper.performBackup.
2009-05-14 09:39:32 -04:00
Android (Google) Code Review
70a16b4084 am 3022a11: Merge change 1239 into donut
Merge commit '3022a11c4c41afa9d39b4d0d9abd7e6bcb6b8472'

* commit '3022a11c4c41afa9d39b4d0d9abd7e6bcb6b8472':
  Modify camera framework to use new streamlined binder interface.
2009-05-11 10:00:49 -07:00
Dave Sparks
d6289b1b03 Modify camera framework to use new streamlined binder interface.
This is the second half of bug 1837832. Modifies the camera client
and camera service to use the new binder interface. Removes the
old binder interface. There will be one more part to this change
to surface the undefined callbacks to the Java layer so that
partners can implement new features without having to touch the
stack.
2009-05-11 07:36:58 -07:00
Mathias Agopian
6ec72e3fa9 Merge commit 'goog/master' into merge_master 2009-05-08 13:13:12 -07:00
Joe Onorato
c825d3ebd6 fix the sim build. disables the tests for now. 2009-05-08 09:33:19 -07:00
The Android Open Source Project
ec91aab3be am 3fd7e13: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '3fd7e13960c2763225c5c8bc187bd15da04820dd'

* commit '3fd7e13960c2763225c5c8bc187bd15da04820dd':
  Add new binder methods to camera client to support generic callbacks
2009-05-08 07:22:45 -07:00
Mathias Agopian
6bebbcd57b Merge commit 'goog/master' into merge_master 2009-05-07 17:46:45 -07:00
Mathias Agopian
97b8056c31 add support for update-on-demand in SurfaceFlinger 2009-05-07 17:40:23 -07:00
Mathias Agopian
927d37cb78 fix EGL extension string names 2009-05-07 15:07:52 -07:00
Mathias Agopian
2e20bffbab created an new EGL extension called ANDROID_swap_rectangle
ANDROID_swap_rectangle allows to specify the rectangle affected by eglSwapBuffers(), anything outside of this rectangle is unchanged. in particular EGL_BUFFER_DESTROYED only applies to that rectangle. This extension as well as EGL_BUFFER_PRESERVED allow major optimizations on surfaceflinger, which can redraw only the dirty area during compositing.

However, ANDROID_swap_rectangle allows further optimizations in EGL by reducing the amount of copy-back needed. ANDROID_swap_rectangle is particularily important for software implementations.
2009-05-07 15:07:33 -07:00
Dave Sparks
2a04aefdf0 Add new binder methods to camera client to support generic callbacks
This is the first step in a multi-step change to move from the old
specific callbacks to a generic callback. This will allow future
flexibility in the interface without requiring binder rewrites.
Bug 1837832
2009-05-07 12:25:25 -07:00
Joe Onorato
7fca565135 fix the sim build. disables the tests for now. 2009-05-06 12:55:46 -04:00
Android (Google) Code Review
b61381bc94 am 4488b11: Merge change 1039 into donut
Merge commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4'

* commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4':
  Add some C++ code to do raw files for backup
2009-05-06 01:31:32 -07:00
Mathias Agopian
9bd5da4db9 get rid off unneeded flags 2009-05-05 18:29:35 -07:00
Mathias Agopian
b51e18d59b move android_native_buffer_t declaration into its own private/ui/android_native_priv.h header, since user code should never have access to it. 2009-05-05 18:21:32 -07:00
Mathias Agopian
ac2523b161 move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don't include it from egl.h
the android_native_ types are just forward declared in egl.h
2009-05-05 18:11:11 -07:00
Joe Onorato
3ad977b41c Add some C++ code to do raw files for backup 2009-05-05 13:45:25 -07:00
Mathias Agopian
e633f9339a get rid of android_native_buffer_t::getHandle() and replace it with an handle field
this abstraction was not necessary. things are easier now.
2009-05-05 00:59:23 -07:00
Mathias Agopian
430f2ed5c0 removed the "bits" attribute from android_native_buffer_t.
"bits" can never be trusted now that we need to call lock() on the handle to get the virtual address of the buffer.
2009-05-05 00:37:46 -07:00
Mathias Agopian
6279619e42 minor clean-up in FramebufferNativeWindow 2009-05-04 19:38:43 -07:00
Mathias Agopian
dff8e58d47 update surfaceflinger, libui and libagl to the new gralloc api
- Currently the lock/unlock path is naive and is done for each drawing operation (glDrawElements and glDrawArrays). this should be improved eventually.
- factor all the lock/unlock code in SurfaceBuffer.
- fixed "showupdate" so it works even when we don't have preserving eglSwapBuffers().
- improved the situation with the dirty-region and fixed a problem that caused GL apps to not update.
- make use of LightRefBase() where needed, instead of duplicating its implementation
- add LightRefBase::getStrongCount()
- renamed EGLNativeWindowSurface.cpp to FramebufferNativeWindow.cpp

- disabled copybits test, since it clashes with the new gralloc api

- Camera/Video will be fixed later when we rework the overlay apis
2009-05-04 14:17:04 -07:00
Mathias Agopian
fa6eda01a9 Merge commit 'goog/master' into merge_master
Conflicts:
	libs/surfaceflinger/Layer.cpp
	libs/surfaceflinger/SurfaceFlinger.cpp
	opengl/libagl/egl.cpp
	opengl/libs/EGL/egl.cpp
	opengl/libs/GLES_CM/gl.cpp
	opengl/libs/GLES_CM/gl_api.in
	opengl/libs/gl_entries.in
	opengl/libs/tools/glapigen
2009-04-30 14:43:18 -07:00
Android (Google) Code Review
a73b41ae60 am 0124a15: Merge change 626 into donut
Merge commit '0124a150157d69a9f0ea109be2390afb5399b8a7'

* commit '0124a150157d69a9f0ea109be2390afb5399b8a7':
  fix 1803886 android15 Translucent GLSurfaceView demo does not display properly
2009-04-29 13:35:37 -07:00
Android (Google) Code Review
8e64406227 am 17f213b: Merge change 602 into donut
Merge commit '17f213bc528cf296e133e9ec9c9e0ce5dce41781'

* commit '17f213bc528cf296e133e9ec9c9e0ce5dce41781':
  Bug fix(1807910): media recorder crash due to the use of locked camera object (last part)
2009-04-29 13:35:33 -07:00