23803 Commits

Author SHA1 Message Date
Nick Kralevich
fc66fa5376 am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch 2010-06-10 11:57:05 -07:00
Nick Kralevich
9a9724c3be am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken

* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
  do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
2010-06-10 11:54:53 -07:00
Nick Kralevich
a2c6d5bf30 do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Change-Id: Ie20371234a531f65f523682a0d0c27394dc30afa
2010-06-10 10:39:42 -07:00
James Dong
3aede37f19 am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken 2010-06-10 10:16:55 -07:00
Andreas Huber
7b909c0553 am 66b89a62: Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken 2010-06-10 10:14:50 -07:00
James Dong
3a0b37a04e Merge "Remove the lock/unlock workaround from CameraService" into kraken 2010-06-10 10:14:38 -07:00
Andreas Huber
66b89a62aa Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken 2010-06-10 10:12:57 -07:00
Andreas Huber
e2f85077a2 Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed.
Change-Id: I4a9aa80f392dbef72f81e25c67e5bd0654848b2c
2010-06-10 09:52:11 -07:00
Kenny Root
c46f03e4a9 am 36921ad8: am b00854d4: Import revised translations 2010-06-09 22:33:47 -07:00
Kenny Root
36921ad858 am b00854d4: Import revised translations
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken

* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
  Import revised translations
2010-06-09 22:31:32 -07:00
Kenny Root
b00854d4c0 Import revised translations
Change-Id: I25faf1ade5252fa29cf43aa13e99fef9fc31b418
2010-06-09 22:25:58 -07:00
James Dong
71d714ccbf Remove the lock/unlock workaround from CameraService
bug - 2677772

Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
2010-06-09 21:30:43 -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
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
Jean-Baptiste Queru
030b0ebebf merge from froyo-plus-aosp
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
2010-06-09 16:09:19 -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
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
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
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
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
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
Joe Onorato
bd73d01a9c Cap the number of notifications that a given package can post.
Right now the number is 50, just to prevent apps that have gone completely bonkers.  I think the limit should be lower.

Change-Id: Ib2c4abf669c8b0250e5421b6d5aeb81aeb2f82ce
2010-06-09 09:15:25 -07:00
Joe Onorato
fe4f3ae33c Move the usb mass storage notification & activity into SystemUI.apk.
Also fix the notification to show properly when the runtime is restarted.

Change-Id: Id0c7ef9f9dc9c9df18428cbaa7db1703f085137e
2010-06-09 09:15:25 -07:00
Joe Onorato
d2b1f00e1e Add some disabled logging and another test case for reapplying the notification views.
Change-Id: I839d7771ab42a5d508ce7d15385f6ac6a4e3be83
2010-06-09 09:15:25 -07:00
Viktor Yakovel
964be41e9e Fix incorrect calculation of start and end indices of changed text
- The problem is taht the calculation of indices does not take the
  difference in original and modified text lengths into account.
- If reportExtractedText() is called from the onDraw() function,
  mInputMethodState is not reset.

The error can occur when the user is editing formatted text using a full screen editor.
One example of formatted text is phone numbers (e.g. dashes are added to North American
numbers by the PhoneNumberFormattingTextWatcher class).
If the two first digits are removed from the number 555-666-777, the new number becomes 566--777.
This is due incorrect calculation of start and end indices of the changed text. The error is in
the TextView class and the problem is that the calculation does not take the difference in original
and modified text lengths into account.

Change-Id: If12d0f571873a6f1874102377432affb64ee21e8
2010-06-09 09:14:37 -07:00
Jean-Baptiste Queru
cd5529a9c7 Merge "Fix for deadlock between StatusBarService and NotificationManagerService" 2010-06-09 07:28:50 -07:00
The Android Open Source Project
6ac4e4c755 merge from open-source master
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
2010-06-09 07:14:36 -07:00
Mathias Agopian
34e5d967f4 am 55f8209d: Merge "allow re-targetting of surfaces" into kraken 2010-06-08 20:15:56 -07:00