Mathias Agopian
94aa09680a
should fix the build.
2009-05-08 16:05:23 -07:00
Android (Google) Code Review
f241d55c20
Merge change 1289 into donut
...
* changes:
only export the GL entry-points, hide everything else.
2009-05-08 15:51:01 -07:00
Mathias Agopian
48685c45bb
only export the GL entry-points, hide everything else.
...
Conflicts:
opengl/libagl/Android.mk
opengl/libs/Android.mk
opengl/libs/egl_impl.h
2009-05-08 15:23:38 -07:00
Android (Google) Code Review
4047ff2ca0
Merge change 1276 into donut
...
* changes:
Define mime type for shortcut validation path.
2009-05-08 14:55:39 -07:00
Android (Google) Code Review
635646b3ce
Merge change 1278 into donut
...
* changes:
Squashed commit of the following:
2009-05-08 14:46:41 -07:00
Android (Google) Code Review
530b0521d5
Merge change 1275 into donut
...
* changes:
Make the internal storage monitor work correctly when internal storage is very large.
2009-05-08 14:46:21 -07:00
The Android Open Source Project
6396c51e67
merge 55280a9
...
Merge commit '55280a9'
2009-05-08 13:33:21 -07:00
Mathias Agopian
5958661507
Merge commit 'goog/master' into merge_master
2009-05-08 13:13:12 -07:00
Android (Google) Code Review
a1b9b6a529
am 672f1e2: Merge change 1192 into donut
...
Merge commit '672f1e2b07d985526bfd5606e6a888005fdcb70c'
* commit '672f1e2b07d985526bfd5606e6a888005fdcb70c':
Fix 1825581 - device restarts when using A2DP.
2009-05-08 12:25:06 -07:00
The Android Open Source Project
d56e9daff7
manual merge 3a6645a
...
Merge commit '3a6645a'
2009-05-08 12:16:40 -07:00
Android (Google) Code Review
0960c1d35f
Merge change 1192 into donut
...
* changes:
Fix 1825581 - device restarts when using A2DP.
2009-05-08 11:41:47 -07:00
Android (Google) Code Review
3398aa6c7d
Merge change 1114 into donut
...
* changes:
Fix keyboard redraw bug on long-press of CapsLock.
2009-05-08 11:31:03 -07:00
Android (Google) Code Review
d2d304e104
am 17a5e5d: Merge change 1217 into donut
...
Merge commit '17a5e5de3d864842b723efe24650863db0656a14'
* commit '17a5e5de3d864842b723efe24650863db0656a14':
Sketch out the IBackupTransport api
2009-05-08 11:12:34 -07:00
Android (Google) Code Review
5a49d8c25d
Merge change 1217 into donut
...
* changes:
Sketch out the IBackupTransport api
2009-05-08 11:10:34 -07:00
Joe Onorato
11c2776591
am c825d3e: fix the sim build. disables the tests for now.
...
Merge commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22'
* commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22':
fix the sim build. disables the tests for now.
2009-05-08 09:35:32 -07:00
Joe Onorato
2a98fb9fb1
fix the sim build. disables the tests for now.
2009-05-08 09:33:19 -07:00
The Android Open Source Project
0ced3f709d
manual merge of 1e09a72
...
Merge commit '1e09a72'
2009-05-08 07:23:54 -07:00
The Android Open Source Project
ecfb57f4f6
am 60f3eb5: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd'
* commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd':
Define the URI path, columns and constants for shortcut validation.
2009-05-08 07:22:45 -07:00
The Android Open Source Project
13bfa901be
am b59f23d: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db'
* commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db':
Require native-order direct buffers for glXXXPointer APIs.
2009-05-08 07:22:45 -07:00
The Android Open Source Project
031af5ad86
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
The Android Open Source Project
14a4c67dbb
am 8705a41: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5'
* commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5':
* update density correctly when the configuration is changed.
2009-05-08 07:22:44 -07:00
The Android Open Source Project
d55158b686
am c664d18: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e'
* commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e':
don't use modulo
2009-05-08 07:22:44 -07:00
The Android Open Source Project
490f45b8ec
am 572ae14: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f'
* commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f':
Fix automatically generated code for glGet
2009-05-08 07:22:41 -07:00
The Android Open Source Project
bc1b1cc401
manual merge of 7ec32cc
...
Merge commit '7ec32cc'
2009-05-08 07:21:43 -07:00
The Android Open Source Project
1963bba40a
am 5085ef6: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
...
Merge commit '5085ef64ac3e589b1674dddcb6dabe3600e347da'
* commit '5085ef64ac3e589b1674dddcb6dabe3600e347da':
2009-05-08 00:54:55 -07:00
Scott Main
6e85bdd536
am b6868d0: am 9b825aa: AI 148470: add documentation about aapt image op
...
Merge commit 'b6868d0048ec814e02ced35df6ad6e7b72389ca4'
* commit 'b6868d0048ec814e02ced35df6ad6e7b72389ca4':
AI 148470: add documentation about aapt image optimization
2009-05-08 00:54:53 -07:00
The Android Open Source Project
bed158f1de
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 18:56:43 -07:00
The Android Open Source Project
7b2a28eb75
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 18:49:48 -07:00
The Android Open Source Project
7136037d4d
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 18:34:11 -07:00
Jack Palevich
46d25a371d
Require native-order direct buffers for glXXXPointer APIs.
...
This was always a documented restriction, but was not enforced by the runtime until now.
Until now, if you passed in some other kind of buffer, it would sometimes work, and
sometimes fail. The failures happened when the Java VM moved the buffer data while
OpenGL was still holding a pointer to it.
Now we throw an exception rather than leaving the system in a potentially bad state.
2009-05-07 18:28:29 -07:00
The Android Open Source Project
e5752df54b
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 17:51:28 -07:00
Android (Google) Code Review
c1d9854e39
Merge change 1164 into donut
...
* changes:
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 17:47:54 -07:00
Mathias Agopian
15e3747012
Merge commit 'goog/master' into merge_master
2009-05-07 17:46:45 -07:00
The Android Open Source Project
b4beae478a
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 17:40:33 -07:00
Mathias Agopian
1e16b13857
add support for update-on-demand in SurfaceFlinger
2009-05-07 17:40:23 -07:00
Android (Google) Code Review
ba87f0836e
Merge change 1108 into donut
...
* changes:
* update density correctly when the configuration is changed. * Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
2009-05-07 17:39:57 -07:00
The Android Open Source Project
95a2af1c87
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 17:25:17 -07:00
Android (Google) Code Review
144f2965c8
Merge change 760 into donut
...
* changes:
don't use modulo
2009-05-07 17:23:51 -07:00
The Android Open Source Project
7476ede9ac
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 17:04:14 -07:00
Android (Google) Code Review
bc4a2d58e1
Merge change 1163 into donut
...
* changes:
Fix automatically generated code for glGet
2009-05-07 17:01:13 -07:00
The Android Open Source Project
f3f77c2b0f
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 16:45:46 -07:00
Mathias Agopian
e6bf8b32b6
fix EGL extension string names
2009-05-07 15:07:52 -07:00
Mathias Agopian
df3ca30bf6
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
Brandon Ballinger
375cfea26b
am fedf566: Merge branch \'readonly-p4-donut\' into donut
...
Merge commit 'fedf566b9e00f18588fc104caafd047af069844a'
* commit 'fedf566b9e00f18588fc104caafd047af069844a':
AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
2009-05-07 14:30:13 -07:00
The Android Open Source Project
6f6ca074ed
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
2009-05-07 14:28:57 -07:00
Brandon Ballinger
4636d459e8
Merge branch 'readonly-p4-donut' into donut
2009-05-07 14:26:17 -07:00
Dave Sparks
9b35233ea5
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
Scott Main
2665202dba
am 9b825aa: AI 148470: add documentation about aapt image optimization
...
Merge commit '9b825aa0eec5f143cec4c3cfeff97ba8d3d9d093' into donut
* commit '9b825aa0eec5f143cec4c3cfeff97ba8d3d9d093':
AI 148470: add documentation about aapt image optimization
2009-05-07 12:00:28 -07:00
Android (Google) Code Review
3c1a21bd42
am b85c374: Merge change 1155 into donut
...
Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'
* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
Don't allow negative numbers in ToneGenerator toneType parameter
2009-05-07 11:54:50 -07:00
Android (Google) Code Review
c474615a51
Merge change 1155 into donut
...
* changes:
Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596
2009-05-07 11:52:06 -07:00