26203 Commits

Author SHA1 Message Date
Andreas Huber
03e83d4ad9 am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
Merge commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp

* commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
  Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
2010-08-30 16:16:03 -07:00
Andreas Huber
68ae91cbd2 Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread 2010-08-30 16:12:46 -07:00
Andreas Huber
0ddf8c09f9 Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
Change-Id: Ib8615ce5a89a9a846ee2f9f96cdfb23462f72c7a
2010-08-30 16:08:03 -07:00
Andreas Huber
987556bc9b am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread
Merge commit 'abb8398e5ab40a3078902c5333126a0743ba2458' into gingerbread-plus-aosp

* commit 'abb8398e5ab40a3078902c5333126a0743ba2458':
  Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
2010-08-30 15:46:58 -07:00
Andreas Huber
abb8398e5a Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread 2010-08-30 15:43:41 -07:00
Andreas Huber
f88ca7a033 Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.
Change-Id: Ie8d6a3865a0477e28d4b76bb9038e468451287b1
related-to-bug: 2556656
2010-08-30 15:25:35 -07:00
Mattias Falk
4076d4f887 am 12dbee82: Avoid NullPointerException in BrowserFrame
Merge commit '12dbee827353ecdb690d27c3f52e26afc71e0774' into gingerbread-plus-aosp

* commit '12dbee827353ecdb690d27c3f52e26afc71e0774':
  Avoid NullPointerException in BrowserFrame
2010-08-30 15:21:55 -07:00
Jean-Baptiste Queru
86aeac9844 am 1d22e122: Merge "Fix a monkey crash when the new WebView is destroyed."
Merge commit '1d22e122a6f278a432519673a8ad3e4853934461' into gingerbread-plus-aosp

* commit '1d22e122a6f278a432519673a8ad3e4853934461':
  Fix a monkey crash when the new WebView is destroyed.
2010-08-30 15:21:51 -07:00
Kenny Root
8a5ab396cf am 2e86809b: Merge "Native libraries on SD" into gingerbread
Merge commit '2e86809b6c79375d23c0975914efc3b66e89ac90' into gingerbread-plus-aosp

* commit '2e86809b6c79375d23c0975914efc3b66e89ac90':
  Native libraries on SD
2010-08-30 15:21:17 -07:00
Kenny Root
2e86809b6c Merge "Native libraries on SD" into gingerbread 2010-08-30 15:16:10 -07:00
Kenny Root
0ac83f5a7c Native libraries on SD
* Add native library tests during package move

* Fix omission that let PackageSettings and ApplicationInfo get out of
  sync.

Change-Id: Ic4958f971cb2c9cfd270522fdc120b4031c1124a
2010-08-30 15:14:06 -07:00
Mattias Falk
12dbee8273 Avoid NullPointerException in BrowserFrame
Avoid NullPointerException in BrowserFrame in
method createWindow. getWebViewCore can return
null if WebView has been destroyed. Crash found
in live environment.

Change-Id: I49c3549a037d8f424a0abaee1f8933974b1ec9d7
2010-08-30 15:10:55 -07:00
Eric Laurent
4421784895 am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
Merge commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp

* commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349':
  Fix issue 2952766.
2010-08-30 15:04:48 -07:00
Jean-Baptiste Queru
1d22e122a6 Merge "Fix a monkey crash when the new WebView is destroyed." 2010-08-30 15:03:06 -07:00
Eric Laurent
ae6bdc23bd Merge "Fix issue 2952766." into gingerbread 2010-08-30 15:02:06 -07:00
Wu-cheng Li
6e46e6f748 am 7ec7b997: Remove camera metering mode API.
Merge commit '7ec7b9970cc3a6311bf043e228991adf24c43523' into gingerbread-plus-aosp

* commit '7ec7b9970cc3a6311bf043e228991adf24c43523':
  Remove camera metering mode API.
2010-08-30 13:48:07 -07:00
Wu-cheng Li
7ec7b9970c Remove camera metering mode API.
Metering mode is not supported yet.

Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
2010-08-30 13:33:53 -07:00
Jean-Baptiste Queru
ff749b9a0d am 55a2df8c: Merge "Telephony: Control operator selection using EF_CSP data."
Merge commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp

* commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
  Telephony: Control operator selection using EF_CSP data.
2010-08-30 13:20:57 -07:00
Jean-Baptiste Queru
9773cd73b6 am f470ed86: Merge "Support surrogate pairs when layouting text"
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp

* commit 'f470ed8630e9e648727443b065b9f1c69fee34d6':
  Support surrogate pairs when layouting text
2010-08-30 13:20:41 -07:00
Andreas Huber
9aa05ec2cd am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp

* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
  Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
2010-08-30 13:06:55 -07:00
Andreas Huber
681c5ff208 Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread 2010-08-30 13:04:21 -07:00
Jean-Baptiste Queru
55a2df8c77 Merge "Telephony: Control operator selection using EF_CSP data." 2010-08-30 13:00:48 -07:00
Andreas Huber
30cfa20dfc Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
Change-Id: I1ca6bd8faba0185f9694f9dc04d2b3e6a7ab5ac3
related-to-bug: 2370115
2010-08-30 12:46:12 -07:00
Eric Laurent
5762dc1983 am 858bb4f6: Merge "LVM release 1.07 delivery." into gingerbread
Merge commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229' into gingerbread-plus-aosp

* commit '858bb4f66ea1bd9c48b9817cb44a59c8b0394229':
  LVM release 1.07 delivery.
2010-08-30 12:33:56 -07:00
Eric Rowe
6151a9ef23 am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread
Merge commit 'f72b0e447296bc07104af62c33c56bc15b7a6677' into gingerbread-plus-aosp

* commit 'f72b0e447296bc07104af62c33c56bc15b7a6677':
  DO NOT MERGE Add A2DP and Headset connection stress tests.
2010-08-30 12:33:52 -07:00
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
Eric Laurent
858bb4f66e Merge "LVM release 1.07 delivery." into gingerbread 2010-08-30 11:39:34 -07:00
Eric Rowe
f72b0e4472 Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 2010-08-30 11:37:10 -07:00
Banavathu, Srinivas Naik
0e67c8926b Telephony: Control operator selection using EF_CSP data.
As per CPHS4_2.WW6, CPHS B.4.7.1, the most significant bit of
Value Added Services Group(0xC0) info, controls operator selection menu.
   -If this bit is set, display operator selection menu to user.
   -If this bit is not set do not display operator selection menu to user,
	 set Network Selection Mode to Automatic.

Change-Id: Icca4898abced0b0beb94c3434448a26eae72008b
2010-08-30 11:05:38 -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
Jean-Baptiste Queru
f470ed8630 Merge "Support surrogate pairs when layouting text" 2010-08-30 09:15:42 -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 Laurent
b8453f4e0e Fix issue 2952766.
The problem is that the audio policy manager does not handle the input devices
when forced use for telephony is changed.
The problem does not appear in a call over PSTN becasue only teh output devices drives the
routing of in call audio to/from the base band.

The fix consists in modifying AudioPolicyManagerBase::setForceUse() to check for active inputs
and update the input device if needed.

Change-Id: I0d36d1f5eef1cce527929180c29b025439902f10
2010-08-27 17:10:36 -07: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