Mathias Agopian
bb84a96acc
Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
...
* changes:
update EGL headers to the latest
update GL ES stub libraries with the new GL ES headers
fix OpenGL ES extension headers from khronos
update the OpenGL ES headers to the latest
2010-06-09 19:54:29 -07:00
Mathias Agopian
e81a3cb2bd
update EGL headers to the latest
...
note that this doesn't update the EGL stubs.
Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
2010-06-09 18:56:05 -07:00
Romain Guy
9a15900572
Merge "Move OpenGL support out of ViewRoot into a new HardwareRenderer class."
2010-06-09 18:27:31 -07:00
Mathias Agopian
11cca925b2
update GL ES stub libraries with the new GL ES headers
...
Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
2010-06-09 18:20:21 -07:00
Mathias Agopian
05bb9c973b
fix OpenGL ES extension headers from khronos
...
the official headers have a couple typos, which
this CL fixes.
Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b
2010-06-09 18:19:11 -07:00
Mathias Agopian
8f62c3031e
update the OpenGL ES headers to the latest
...
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
2010-06-09 18:08:15 -07:00
Robert Greenwalt
f1ab804ea7
Merge "Clean up APN notifications."
2010-06-09 17:11:05 -07:00
Jean-Baptiste Queru
93c90df092
am 030b0ebe: merge from froyo-plus-aosp
2010-06-09 16:12:11 -07:00
Jean-Baptiste Queru
1a62198e28
merge from froyo-plus-aosp
...
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
2010-06-09 16:09:19 -07:00
Jason Sams
ad6b91320d
Merge "Remove float8/16 from RS type list. We will not have time to work through ABI issues for these types on arm for our ship date. Can be re-added later."
2010-06-09 15:54:35 -07:00
Nick Kralevich
3d45b00208
am 69b04a70: am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken
2010-06-09 15:26:41 -07:00
Joe Onorato
14e6c724a4
resolved conflicts for merge of f7b79151 to master
...
Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca
2010-06-09 15:07:16 -07:00
Nick Kralevich
db4b2ee4e6
am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken
2010-06-09 14:50:10 -07:00
Nick Kralevich
b4f689e6d5
Merge "Fix a problem with leaking UDP sockets." into kraken
2010-06-09 14:49:10 -07:00
Joe Onorato
e4e2e67a4c
am b5f9b4f1: am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
2010-06-09 14:47:43 -07:00
Joe Onorato
75e51bd81f
am ae706c10: Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken
2010-06-09 14:47:18 -07:00
Joe Onorato
ba4e23477d
am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
2010-06-09 14:45:31 -07:00
Joe Onorato
ea22badf01
Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken
...
* changes:
Add a test item the turns on a bunch of extra icons.
Move the status bar icon list, hopefully for the last time.
Call into the notification manager when the panel is revealed.
Move status_bar_latest_event and LatestItemView into SystemUI.apk.
Start the status bar service based on a configuration option, instead of trampolining through a braodcast receiver.
Require the STATUS_BAR_SERVICE permission for something to be the status bar.
Handle errors inflating notifications (and their icons).
2010-06-09 14:44:58 -07:00
Joe Onorato
c4b1220105
Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
...
* changes:
dead code removal
Cap the number of notifications that a given package can post.
Move the usb mass storage notification & activity into SystemUI.apk.
Add some disabled logging and another test case for reapplying the notification views.
2010-06-09 14:43:47 -07:00
Dianne Hackborn
2de6b703d7
Merge "Add Fragment option menu APIs."
2010-06-09 12:29:51 -07:00
Christopher Tate
8d56d7b1b7
am 7e8566a6: am d7f659e8: Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
2010-06-09 12:27:58 -07:00
Christopher Tate
e848d6eb0c
am d7f659e8: Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
2010-06-09 12:26:38 -07:00
Christopher Tate
3c2967b345
Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
2010-06-09 12:25:05 -07:00
The Android Open Source Project
5e1b2f531d
merge from open-source master
...
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
2010-06-09 12:17:03 -07:00
The Android Open Source Project
0887ab4d10
merge from open-source master
...
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
2010-06-09 12:14:58 -07:00
Derek Sollenberger
0ab98c05c4
Merge "Consolidate common zoom code and tighten access to some ZoomManager variables."
2010-06-09 11:51:48 -07:00
James Dong
26ad4fa4c6
am 689497fb: am 457d5ae3: Fix a potential(observed sometimes) media server crash
2010-06-09 11:31:47 -07:00
James Dong
6a852f1343
am 457d5ae3: Fix a potential(observed sometimes) media server crash
2010-06-09 11:29:30 -07:00
Jean-Baptiste Queru
1e254923ea
Merge "Adding mimetypes to the mimetype map used in the web view"
2010-06-09 10:51:16 -07:00
The Android Open Source Project
ae68e08411
ignore from open-source master
...
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
2010-06-09 09:21:39 -07:00
Jean-Baptiste Queru
64ba44a221
Merge "Fix for deadlock between StatusBarService and NotificationManagerService"
2010-06-09 07:28:50 -07:00
The Android Open Source Project
1e94155433
merge from open-source master
...
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
2010-06-09 07:14:36 -07:00
Kenny Root
c91e0eda56
Add invariant check for stylesString size
...
It was possible for stylesStrings to claim to start past the end of the
data area thereby making mStringPoolSize larger than the data area.
Change-Id: Ibc4d5b429e3a388516135801c8abc3681daae291
2010-06-08 20:50:37 -07:00
Mathias Agopian
67c4219aa3
am 34e5d967: am 55f8209d: Merge "allow re-targetting of surfaces" into kraken
2010-06-08 20:18:05 -07:00
Mathias Agopian
2b6dd6deac
am 55f8209d: Merge "allow re-targetting of surfaces" into kraken
2010-06-08 20:15:56 -07:00
Mathias Agopian
74b3237fa9
Merge "allow re-targetting of surfaces" into kraken
2010-06-08 20:14:11 -07:00
Mathias Agopian
579b3f88d0
allow re-targetting of surfaces
...
Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.
Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
2010-06-08 20:10:02 -07:00
Adam Powell
d8570198ae
Merge "Dropdown mode for ActionBar; style and API updates"
2010-06-08 17:27:09 -07:00
Jim Miller
4518723fc8
am db603bb5: am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
2010-06-08 16:37:12 -07:00
Jim Miller
c8bc7d3d59
am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
2010-06-08 16:35:21 -07:00
Jim Miller
9cc61ca487
am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
...
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken
* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix 2737842: Disable KeguardManager API if device policy is enabled
2010-06-08 16:33:26 -07:00
Jim Miller
91874c12e2
am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
...
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp
* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix 2737842: Disable KeguardManager API if device policy is enabled
2010-06-08 16:33:22 -07:00
Jim Miller
5ca447aa0c
Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
2010-06-08 16:31:32 -07:00
Mathias Agopian
7b268e7967
am 37583aeb: am 1debc665: fix [2751143] Device crashes when in a text box for too long
2010-06-08 15:49:45 -07:00
Mathias Agopian
9a96cb5d5a
am 1debc665: fix [2751143] Device crashes when in a text box for too long
2010-06-08 15:47:37 -07:00
Jason Sams
f60358a767
Merge "Begin using reflected files."
2010-06-08 15:43:57 -07:00
Jean-Baptiste Queru
2b4c33ff92
Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend"
2010-06-08 15:43:02 -07:00
Mathias Agopian
53503a97a9
fix [2751143] Device crashes when in a text box for too long
2010-06-08 15:40:56 -07:00
The Android Open Source Project
57e32fb1ce
merge from open-source master
...
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
2010-06-08 13:17:41 -07:00
James Dong
a5abd1662d
am d49c9818: am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken
2010-06-08 13:17:07 -07:00