26169 Commits

Author SHA1 Message Date
Andreas Huber
7ed9104c3a am f6639c46: Finetune some rtsp timeout constants.
Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp

* commit 'f6639c46e83a1ccab7b293192c208091d17c61be':
  Finetune some rtsp timeout constants.
2010-08-30 12:33:25 -07:00
Eric Fischer
a7dae24ccd am 01ee34d7: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8' into gingerbread-plus-aosp

* commit '01ee34d7078afcf4d938d4c3ea29a4b9fdcc02f8':
  Import revised translations.  DO NOT MERGE
2010-08-30 12:33:19 -07:00
Andreas Huber
6df6d60681 am df992ac9: Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
Merge commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b' into gingerbread-plus-aosp

* commit 'df992ac9cc54cedb3e384617ed683a2d1a24d38b':
  ALoopers can now be named (useful to distinguish threads).
2010-08-30 12:33:08 -07:00
Andreas Huber
f6639c46e8 Finetune some rtsp timeout constants.
Change-Id: Ice731c5097c2a2dee8a7f0cd45b547cd34f532c6
2010-08-30 10:35:56 -07:00
Imre Sunyi
1429f465f4 am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead
Merge commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf' into gingerbread-plus-aosp

* commit 'fd04143a47770256dabcfa4d8447127b3ec8b2bf':
  Shutdown when capacity is 0% and no charging or when battery is dead
2010-08-30 10:33:35 -07:00
Eric Fischer
01ee34d707 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-30 10:28:58 -07:00
Andreas Huber
df992ac9cc Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 2010-08-30 10:28:24 -07:00
Derek Sollenberger
a3faa923a0 am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp

* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
  Support pre-loading browser plugins on the system image.
2010-08-30 08:06:36 -07:00
Derek Sollenberger
6726d6bb1a Merge "Support pre-loading browser plugins on the system image." into gingerbread 2010-08-30 07:31:46 -07:00
Daniel Sandler
02b19843d4 am 27cf4ad8: Fix build.
Merge commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888' into gingerbread-plus-aosp

* commit '27cf4ad88ff8ba2b64d806b0ebb0181b1f42c888':
  Fix build.
2010-08-27 20:39:39 -07:00
Daniel Sandler
27cf4ad88f Fix build.
Change-Id: I848bf50dc7c928e53a3637c4cec51ebcaef4f47f
2010-08-27 23:36:20 -04:00
Daniel Sandler
554d8726f8 am 0776deff: More obsolete status bar bits. DO NOT MERGE
Merge commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5' into gingerbread-plus-aosp

* commit '0776deff39b7fe8435f2cbf6aa84bf202bac70f5':
  More obsolete status bar bits. DO NOT MERGE
2010-08-27 20:00:40 -07:00
Daniel Sandler
44af754cf0 am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE
Merge commit 'd02bdaab495641ab50e2123fdfd99a819cc40540' into gingerbread-plus-aosp

* commit 'd02bdaab495641ab50e2123fdfd99a819cc40540':
  Remove experimental immersive mode support. DO NOT MERGE
2010-08-27 20:00:29 -07:00
Daniel Sandler
0776deff39 More obsolete status bar bits. DO NOT MERGE
Bug: 2949215
Change-Id: Ibf39d37df63ce4bbd0e0da5325495feec9d69a67
2010-08-27 22:57:39 -04:00
Daniel Sandler
d02bdaab49 Remove experimental immersive mode support. DO NOT MERGE
Bug: 2949215

Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d
2010-08-27 22:57:39 -04:00
Eric Fischer
fd33de37f5 Import revised translations. DO NOT MERGE
Change-Id: I0f69e84a77ae78da72946178e29ecea9dd3f7062
2010-08-27 17:08:59 -07:00
Kenny Root
8328578152 am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp

* commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3':
  Allow native shared libraries in ASEC containers
2010-08-27 16:45:45 -07:00
Brad Fitzpatrick
63b5b87010 am 15665bb6: Add current.xml API file missing from I8f2b6b79.
Merge commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53' into gingerbread-plus-aosp

* commit '15665bb60eb2ca8d114724379c156ff7f2a6cc53':
  Add current.xml API file missing from I8f2b6b79.
2010-08-27 16:43:28 -07:00
Kenny Root
7046bd924f Merge "Allow native shared libraries in ASEC containers" into gingerbread 2010-08-27 16:42:28 -07:00
Brad Fitzpatrick
15665bb60e Add current.xml API file missing from I8f2b6b79.
Fixes build.

Change-Id: I7d845fb45b5221425f41cf3069fea7f31ea6b225
2010-08-27 16:40:22 -07:00
Kenny Root
85387d7ba3 Allow native shared libraries in ASEC containers
This change moves the native library handling earlier in the package
installation process so that it may be inserted into ASEC containers
before they are finalized in the DefaultContainerService.

Note that native libraries on SD card requires that vold mount ASEC
containers without the "noexec" flag on the mount point.

Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
2010-08-27 16:40:06 -07:00
Dianne Hackborn
8da20dd037 am 4f8c2f26: Fix docs build.
Merge commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699' into gingerbread-plus-aosp

* commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699':
  Fix docs build.
2010-08-27 16:18:09 -07:00
Dianne Hackborn
4f8c2f26bf Fix docs build.
Change-Id: I49591c46080361acf5b528116726c27b6ed9da9a
2010-08-27 16:14:42 -07:00
Brad Fitzpatrick
d71021cb30 am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread
Merge commit '0c731f99b05630e16dce572ac206ab75c90891cd' into gingerbread-plus-aosp

* commit '0c731f99b05630e16dce572ac206ab75c90891cd':
  Send broadcast intent when configured location providers change.
2010-08-27 16:10:06 -07:00
Brad Fitzpatrick
0c731f99b0 Merge "Send broadcast intent when configured location providers change." into gingerbread 2010-08-27 16:02:21 -07:00
Andreas Huber
c4e0b70a21 ALoopers can now be named (useful to distinguish threads).
Change-Id: Ieabaddb2e3a9e3a7a5bc36e55cd0721b60dbd50e
2010-08-27 15:21:07 -07:00
Wu-cheng Li
af610b2b9f am 1620d118: Fix SDK build error.
Merge commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12' into gingerbread-plus-aosp

* commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12':
  Fix SDK build error.
2010-08-27 15:13:53 -07:00
Wu-cheng Li
1620d118a4 Fix SDK build error.
Change-Id: I4705c10da850d684caa7067d656aff11bc65acbb
2010-08-27 15:09:20 -07:00
James Dong
a5fe77d004 am df8356ff: Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread
Merge commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad' into gingerbread-plus-aosp

* commit 'df8356ff9a2f1fab44bb3aea26c5da0a9f23a4ad':
  Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
2010-08-27 14:36:02 -07:00
James Dong
df8356ff9a Merge "Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder is occasionally too small." into gingerbread 2010-08-27 14:33:54 -07:00
Wu-cheng Li
705c2e66dc am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp

* commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2':
  Unhide camera fps range API and deprecate old ones.
2010-08-27 14:22:21 -07:00
Wu-cheng Li
d851e6fea5 Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 2010-08-27 14:20:51 -07:00
Wu-cheng Li
5f1e69c76e Unhide camera fps range API and deprecate old ones.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
2010-08-27 14:19:32 -07:00
Mathias Agopian
e481f19cf0 am ff3dcf27: Merge "cleanup EGL a bit. remove unused extension." into gingerbread
Merge commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f' into gingerbread-plus-aosp

* commit 'ff3dcf27be2bbb259b7605396d36e50ade35266f':
  cleanup EGL a bit. remove unused extension.
2010-08-27 14:17:00 -07:00
Mathias Agopian
ff3dcf27be Merge "cleanup EGL a bit. remove unused extension." into gingerbread 2010-08-27 14:14:46 -07:00
Brad Fitzpatrick
0c5a04014d Send broadcast intent when configured location providers change.
See e.g. http://code.google.com/p/android/issues/detail?id=10042

This is also needed by the power control widget, which has no reliable
way otherwise of staying in-sync.

Change-Id: I8f2b6b79b1843329bae952a25ea56f15e3cf92aa
2010-08-27 14:01:23 -07:00
James Dong
90862e2a8b Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
is occasionally too small.

bug - 2882917

Change-Id: Id59d8529084c5689a26f272e0cd3b1e955fd8a30
2010-08-27 13:59:26 -07:00
James Dong
7d3ff3849c am b86365ad: Merge "Suppress the video recording start signal - bug 2950297" into gingerbread
Merge commit 'b86365ad74a197f2af6d70eedeb19083e31a9686' into gingerbread-plus-aosp

* commit 'b86365ad74a197f2af6d70eedeb19083e31a9686':
  Suppress the video recording start signal
2010-08-27 13:48:48 -07:00
James Dong
b86365ad74 Merge "Suppress the video recording start signal - bug 2950297" into gingerbread 2010-08-27 13:47:06 -07:00
Andreas Huber
05c1cadaea am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread
Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp

* commit '577615c98e390f8417e07844d04304eac5b0e911':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
2010-08-27 13:46:19 -07:00
Andreas Huber
e25e03612e am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread
Merge commit 'e250c220d1bb3bd117641add94ee7465a82f085c' into gingerbread-plus-aosp

* commit 'e250c220d1bb3bd117641add94ee7465a82f085c':
  We accidentally always aborted after 10 secs, even if the connection was fine.
2010-08-27 13:46:14 -07:00
Andreas Huber
577615c98e Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread 2010-08-27 13:44:14 -07:00
Andreas Huber
e250c220d1 Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread 2010-08-27 13:44:07 -07:00
Andreas Huber
eeb97d91b9 Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
Change-Id: Id491541a6ae501604cda815f8e961a3bfe26db7d
related-to-bug: 2556656
2010-08-27 13:29:08 -07:00
Mathias Agopian
ebc3d5a549 cleanup EGL a bit. remove unused extension.
Change-Id: Ia87120b076ab1bf7b28f06087878d8161fb46c88
2010-08-27 13:17:32 -07:00
Gilles Debunne
053d5ce992 am ee4831c4: Merge "Added char limit to string" into gingerbread
Merge commit 'ee4831c4bb39144b995ea561ad35b9b0e1864b33' into gingerbread-plus-aosp

* commit 'ee4831c4bb39144b995ea561ad35b9b0e1864b33':
  Added char limit to string
2010-08-27 13:16:24 -07:00
Gilles Debunne
ee4831c4bb Merge "Added char limit to string" into gingerbread 2010-08-27 13:13:56 -07:00
Gilles Debunne
9220948272 Added char limit to string
Bug http://b/issue?id=2953774

Change-Id: I8aa1009712b46e54942a3d653059f464dabc3f9f
2010-08-27 13:12:32 -07:00
Kenny Root
8e72490526 am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread
Merge commit 'ad6731b0fc759e446504bca163d8fd2fb6326577' into gingerbread-plus-aosp

* commit 'ad6731b0fc759e446504bca163d8fd2fb6326577':
  Add debugging to ZipFileRO
2010-08-27 13:00:22 -07:00
Kenny Root
ad6731b0fc Merge "Add debugging to ZipFileRO" into gingerbread 2010-08-27 12:58:00 -07:00