Commit Graph

17851 Commits

Author SHA1 Message Date
James Dong
62175f89dc am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread
Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp

* commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca':
  Add some encoding parameters for the "record" utility
2010-08-31 13:25:42 -07:00
Joe Onorato
38d4fb7b15 am 54901c9e: fix the build. will revisit this change in a minute
Merge commit '54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp

* commit '54901c9e8497b33bab1462245864e9dd119bb64c':
  fix the build.  will revisit this change in a minute
2010-08-31 13:25:27 -07:00
Brad Fitzpatrick
5273603e98 Don't propagate StrictMode over one-way Binder calls.
This was causing stack stitching problems where a one-way call with
violations followed by a two-way call without violations was getting
the previous one-way call's violation stack stitched on to the second
caller's stack.

The solution is a little more indirect than I would've liked
(preserving the binder's onTransact flags until enforceInterface) but
was seemingly necessary to work without changing the AIDL compiler.
It should also be sufficiently cheap, since no new calls to
thread-local IPCThreadState lookups were required.  The additional
work is just same-thread getter/setters on the existing
IPCThreadState.

Change-Id: I4b6db1d445c56e868e6d0d7be3ba6849f4ef23ae
2010-08-31 13:16:49 -07:00
James Dong
00807f5ab9 Merge "Add some encoding parameters for the "record" utility" into gingerbread 2010-08-31 13:13:18 -07:00
Jean-Baptiste Queru
cb2e650918 am d3e803ae: Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
Merge commit 'd3e803ae28c369996f9acf6036ea99af5561949c' into gingerbread-plus-aosp

* commit 'd3e803ae28c369996f9acf6036ea99af5561949c':
  Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
2010-08-31 12:45:02 -07:00
Joe Onorato
90d29183a4 am 77881293: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342' into gingerbread-plus-aosp

* commit '77881293ad9a68dfa1c1da4b466f7b2b6465b342':
  DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
2010-08-31 12:12:27 -07:00
Jeff Brown
65ac413cb7 am 6eb5ac9c: Fix doc link in InputDevice.
Merge commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d' into gingerbread-plus-aosp

* commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d':
  Fix doc link in InputDevice.
2010-08-30 23:32:40 -07:00
Chia-chi Yeh
02c4f47878 am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.
Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp

* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
  fixedfft: Only includes cpu-features.h when __arm__ is defined.
2010-08-30 22:06:39 -07:00
Adam Powell
692e121b54 am 0a77ce27: New edge effects for scrolling widgets (overscroll)
Merge commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp

* commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
  New edge effects for scrolling widgets (overscroll)
2010-08-30 19:19:37 -07:00
Adam Powell
359edda83f am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread
Merge commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2' into gingerbread-plus-aosp

* commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2':
  Fix bug 2918587 Infinite loop and memory leak in AdapterView
2010-08-30 18:35:58 -07:00
Adam Powell
28afafdfd3 Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread 2010-08-30 18:33:20 -07:00
Jeff Brown
e0b0e8978f am 8d60866e: Input device calibration and capabilities.
Merge commit '8d60866e2100db70ecf0502c14768a384514d7e9' into gingerbread-plus-aosp

* commit '8d60866e2100db70ecf0502c14768a384514d7e9':
  Input device calibration and capabilities.
2010-08-30 18:22:32 -07:00
Brad Fitzpatrick
31a40d0f6c am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp

* commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972':
  Renaming SharedPreferences$Editor.startCommit to apply
2010-08-30 18:18:54 -07:00
Jeff Brown
38a7fabd96 Input device calibration and capabilities.
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects.  The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.

Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
2010-08-30 18:16:43 -07:00
Brad Fitzpatrick
296e9b712b Merge "Renaming SharedPreferences$Editor.startCommit to apply" into gingerbread 2010-08-30 18:14:44 -07:00
Andreas Huber
52b235b152 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
627020958b 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
a53289ba6b 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
d8864f83bb 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
Mattias Falk
048285c479 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
edd2f65e33 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
daeb9eb67c 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
9a2a7a3f9a Merge "Native libraries on SD" into gingerbread 2010-08-30 15:16:10 -07:00
Eric Laurent
fbb5526f5c 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
e1afd1f1c4 Merge "Fix a monkey crash when the new WebView is destroyed." 2010-08-30 15:03:06 -07:00
Eric Laurent
44de521321 Merge "Fix issue 2952766." into gingerbread 2010-08-30 15:02:06 -07:00
Wu-cheng Li
01a43af593 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
Jean-Baptiste Queru
8cdd4c6fcc 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
cceddb5964 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
1a99837a81 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
ad40891c43 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
7cdfe1e440 Merge "Telephony: Control operator selection using EF_CSP data." 2010-08-30 13:00:48 -07:00
Eric Laurent
44e1255529 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
9f48359b26 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
f64441add6 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
cb14ea46dc 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
d75a5fa55c 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
6a8099f637 Merge "LVM release 1.07 delivery." into gingerbread 2010-08-30 11:39:34 -07:00
Eric Rowe
9838cb73ab Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread 2010-08-30 11:37:10 -07:00
Imre Sunyi
b1936cb31b 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
4cb6dd8679 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-30 10:28:58 -07:00
Andreas Huber
617fa2df06 Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread 2010-08-30 10:28:24 -07:00
Jean-Baptiste Queru
46c9ed2621 Merge "Support surrogate pairs when layouting text" 2010-08-30 09:15:42 -07:00
Derek Sollenberger
3967e9d817 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
bdedbf0713 Merge "Support pre-loading browser plugins on the system image." into gingerbread 2010-08-30 07:31:46 -07:00
Daniel Sandler
db9d522db3 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
158d896843 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
14e5bb5d38 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
Kenny Root
98ed842f53 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
4d77225fc7 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