25066 Commits

Author SHA1 Message Date
Mathias Agopian
533ca7b8f4 am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken 2010-06-09 19:57:01 -07:00
Mathias Agopian
e52d66fa70 am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken 2010-06-09 19:55:57 -07:00
Mathias Agopian
44bea8f803 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
6d4021a67d 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
0889adde3b Merge "Move OpenGL support out of ViewRoot into a new HardwareRenderer class." 2010-06-09 18:27:31 -07:00
Romain Guy
2d6145993e Move OpenGL support out of ViewRoot into a new HardwareRenderer class.
Change-Id: Iffaed924a5defc3c4df26223c390dc27eee115b1
2010-06-09 18:27:08 -07:00
Mathias Agopian
69d2f12e79 update GL ES stub libraries with the new GL ES headers
Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
2010-06-09 18:20:21 -07:00
Mathias Agopian
3b512cd564 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
958f900668 update the OpenGL ES headers to the latest
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
2010-06-09 18:08:15 -07:00
Robert Greenwalt
9396f6e069 Merge "Clean up APN notifications." 2010-06-09 17:11:05 -07:00
Robert Greenwalt
02648a4b84 Clean up APN notifications.
Add APNType info to notifications so you can tell what's happening.  Now, even if a new APN
shares a connection with an already-connected-to- apn type, the new type will get all
the connecting and connected messages on connect and disconnecting/disconnected on disconnect
even though the shared connection remains connected.

Cleaning out the hacks MobileDataStateTracker needed to deal with the old situation.
bug:2226092

Change-Id: Iddd7421d6b91cda7c8405f9c3d5404ac04ef8e42
2010-06-09 16:52:01 -07:00
Jean-Baptiste Queru
e4031a3780 am 030b0ebe: merge from froyo-plus-aosp 2010-06-09 16:12:11 -07:00
Jean-Baptiste Queru
030b0ebebf merge from froyo-plus-aosp
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
2010-06-09 16:09:19 -07:00
Jason Sams
c3db34e58f 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
dfda2adc3d am 69b04a70: am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken 2010-06-09 15:26:41 -07:00
Joe Onorato
8a5f10b30d resolved conflicts for merge of f7b79151 to master
Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca
2010-06-09 15:07:16 -07:00
Nick Kralevich
69b04a7075 am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken 2010-06-09 14:50:10 -07:00
Nick Kralevich
2feafeffb8 Merge "Fix a problem with leaking UDP sockets." into kraken 2010-06-09 14:49:10 -07:00
Joe Onorato
1d46191d88 am b5f9b4f1: am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken 2010-06-09 14:47:43 -07:00
Joe Onorato
f7b7915192 am ae706c10: Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken 2010-06-09 14:47:18 -07:00
Joe Onorato
b5f9b4f15a am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken 2010-06-09 14:45:31 -07:00
Joe Onorato
ae706c10c0 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
302759c1ba 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
Joe Onorato
0faeb078cf Add a test item the turns on a bunch of extra icons.
Change-Id: Ia5884ef46a5b0fa2d608c7924b3eb12293a1da8b
2010-06-09 14:33:31 -07:00
Joe Onorato
75144ea38e Move the status bar icon list, hopefully for the last time.
Change-Id: Ie495a41dac03e1fe5ddccefcbd2a0673090a6db1
2010-06-09 14:33:31 -07:00
Joe Onorato
f1f259165f Call into the notification manager when the panel is revealed.
This lets it turn off the LED.  However, it seems like somebody broke
the notification LEDs.  GRRR.

Change-Id: I3f7066c2b2e1673dc0144a34cf59946351a647be
2010-06-09 14:33:30 -07:00
Joe Onorato
7a0f36bd93 Move status_bar_latest_event and LatestItemView into SystemUI.apk.
Then, now that StatusBarManagerService is the only thing in that package,
move it up to the regular services package.  (I've been waiting for 4 years
to delete that package!)

Change-Id: If5faf44641319fd19e486d1f4e5bc1c6dfcff3ad
2010-06-09 14:33:30 -07:00
Joe Onorato
9e875fcb55 Start the status bar service based on a configuration option, instead of trampolining through
a braodcast receiver.

Change-Id: I6ae0740fea07350b80c35c0ee2d938e0364d773e
2010-06-09 14:33:29 -07:00
Joe Onorato
8bc6c51419 Require the STATUS_BAR_SERVICE permission for something to be the status bar.
Change-Id: I57b2d296e0d0cef0d256ae6697fffc47188d14df
2010-06-09 14:33:23 -07:00
Nick Kralevich
929b4855b8 Fix a problem with leaking UDP sockets.
When dealing with any kind of limited operating system resource,
we should ensure that we properly close everything that we
open, rather than relying on the system garbage collector.

Change-Id: Ic71f710eb85ac71a91b7a1215647c75010d37643
2010-06-09 14:27:43 -07:00
Jason Sams
96d719c917 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.

Change-Id: I957758be7e900a1c55eff9cb5aeb16fa636bd9a0
2010-06-09 14:26:16 -07:00
Jeff Hamilton
fb3a35e586 Fix the build.
Change-Id: Ib633eb144277ec2598f25eac3a9cfe0f0184959e
2010-06-09 16:24:17 -05:00
Jeff Hamilton
35eef702b1 Remove the unused demo data set stuff.
Change-Id: I81f7a8118876ee7cb6c356c63b0d0613d9777d4f
2010-06-09 15:46:59 -05:00
Dianne Hackborn
1c11015ec1 Merge "Add Fragment option menu APIs." 2010-06-09 12:29:51 -07:00
Christopher Tate
ed3939fef0 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
7e8566a66f 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
Dianne Hackborn
b31e84bc45 Add Fragment option menu APIs.
Also fix up how transactions are handled so that a series of transactions
can correctly be created and committed.

Change-Id: I948ba47d49e9b2246a1958bd9eac9dd36dc5a855
2010-06-09 12:26:29 -07:00
Christopher Tate
d7f659e897 Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken 2010-06-09 12:25:05 -07:00
Christopher Tate
7e76ff1c40 Fail gracefully if the user fails to supply necessary args to bmgr
Fixes bug #2755355

Change-Id: I4690756bb5077a6b4bbbfb232cd852cad43cef77
2010-06-09 12:21:31 -07:00
The Android Open Source Project
c08fd46f5c merge from open-source master
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
2010-06-09 12:17:03 -07:00
The Android Open Source Project
3c259d3247 merge from open-source master
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
2010-06-09 12:14:58 -07:00
Derek Sollenberger
1fd54720b0 Merge "Consolidate common zoom code and tighten access to some ZoomManager variables." 2010-06-09 11:51:48 -07:00
James Dong
86de46125c am 689497fb: am 457d5ae3: Fix a potential(observed sometimes) media server crash 2010-06-09 11:31:47 -07:00
James Dong
689497fbd0 am 457d5ae3: Fix a potential(observed sometimes) media server crash 2010-06-09 11:29:30 -07:00
James Dong
457d5ae3c9 Fix a potential(observed sometimes) media server crash
The problem is that we are referring an temp object returned from a function call.
When the function call returned, the temp object is gone; and thus the reference
may be invalidated.

-- rebased

bug - 2734946

Change-Id: I1993c4462df95610ca478f816adc30058af5850e
2010-06-09 11:27:03 -07:00
Derek Sollenberger
369aca27ec Consolidate common zoom code and tighten access to some ZoomManager variables.
This is a single CL in a series of CL's that is focused on moving the
zoom logic from WebView to ZoomManager.

Change-Id: I741fc34d5dd481b89f6e0b33503834c33f4fe69e
http://b/2671604
2010-06-09 14:11:59 -04:00
Jean-Baptiste Queru
9226a713ff 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
855bd44aa9 ignore from open-source master
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
2010-06-09 09:21:39 -07:00
Joe Onorato
d956ae8b81 dead code removal
Change-Id: I4a11f027e764c92602d0429947e9ef39edd882e2
2010-06-09 09:15:25 -07:00
Joe Onorato
005847b03b Handle errors inflating notifications (and their icons).
On an inflation error, the StatusBarService cleans up, removes / doesn't add
the views, and calls into the StatusBarManagerService, which tells the
NotificationManagerService to remove the notification.

That then calls all the way back into the StatusBarService, but I think being
extra careful is okay.  Throughout the status bar, it's all keyed off of the
IBinder key, so if the app comes in with a good notification while we're
cleaning up, we won't lose the new notification or anything like that.

Change-Id: Iea78a637495a8b67810c214b951d5ddb93becacb
2010-06-09 09:15:25 -07:00