Eric Rowe
1ff3da4341
am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class.
...
Merge commit '1314219a37403594f833c2c71744040ebd8d9b04' into gingerbread
* commit '1314219a37403594f833c2c71744040ebd8d9b04':
DO NOT MERGE Separate utility methods into utility class.
2010-09-02 14:26:12 -07:00
Daisuke Miyakawa
3fb3a4fbd0
Merge "VCard refactoring backport." into gingerbread
2010-09-02 12:56:15 -07:00
Eric Laurent
a92ce71cf9
Merge "Fix problem in AudioEffect::command() status." into gingerbread
2010-09-02 12:46:24 -07:00
Eric Rowe
a9e23b3b62
Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread
2010-09-02 11:35:20 -07:00
Chia-chi Yeh
d4d7550d22
Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread
2010-09-02 08:13:01 -07:00
Adam Powell
1b7a93030c
Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread
2010-09-02 00:28:14 -07:00
Dianne Hackborn
f1f5b58ce5
Merge "Improve messages when java process is starting." into gingerbread
2010-09-01 21:15:17 -07:00
Andreas Huber
af538c26bc
Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread
2010-09-01 15:44:46 -07:00
James Dong
5171c04e5a
Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread
2010-09-01 15:41:10 -07:00
Dan Morrill
8bdbfa13b8
Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
2010-09-01 15:03:02 -07:00
Andreas Huber
d937746ca5
Merge "Fixing the build." into gingerbread
2010-09-01 14:21:49 -07:00
Kenny Root
f77ecb53c8
Merge "Add null check for package settings" into gingerbread
2010-09-01 14:09:01 -07:00
Adam Powell
f80fc12c88
Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
2010-09-01 13:57:05 -07:00
Andreas Huber
94d559b8fa
Merge "Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds." into gingerbread
2010-09-01 13:54:12 -07:00
Andreas Huber
949c04fd40
Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
2010-09-01 13:39:27 -07:00
Andreas Huber
76881afbfb
Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
2010-09-01 12:59:04 -07:00
Daniel Sandler
b56665681c
Merge "Fix build (restore deleted assets)." into gingerbread
2010-09-01 11:46:16 -07:00
Derek Sollenberger
e35742b5d5
Merge "Fix invalid comment in WebSettings." into gingerbread
2010-09-01 11:30:12 -07:00
Jesse Wilson
b4afe06506
Merge "Removing AWT. See bug 2732079" into gingerbread
2010-08-31 22:50:31 -07:00
Dianne Hackborn
a0f5241ec6
Merge "Improve debug output when an ANR happens." into gingerbread
2010-08-31 18:56:30 -07:00
Jesse Wilson
a173691c10
Removing AWT. See bug 2732079
...
Change-Id: I0f29d1edbb90b081d743807605682cb64b53b1bc
2010-08-31 16:56:51 -07:00
Gilles Debunne
f93a3eb96e
Merge "Fixed single line state on TextView." into gingerbread
2010-08-31 16:18:06 -07:00
Jeff Brown
875fb77f81
Merge "Remove incomplete input device enumeration NDK API." into gingerbread
2010-08-31 15:45:32 -07:00
Eric Laurent
b3b46883eb
Merge "Audio Effects: fix problems in volume control." into gingerbread
2010-08-31 15:43:36 -07:00
Jeff Brown
774cf1baa1
Remove incomplete input device enumeration NDK API.
...
Change-Id: I32de74ff5fcf0e29179a2aee03ddabd22fa485bb
2010-08-31 15:24:55 -07:00
Brad Fitzpatrick
6d29e39240
Merge "Don't propagate StrictMode over one-way Binder calls." into gingerbread
2010-08-31 14:58:26 -07:00
Andreas Huber
59f189a544
Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
2010-08-31 14:54:37 -07:00
Andreas Huber
6d8d82516e
Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread
2010-08-31 14:41:51 -07:00
Xavier Ducrohet
f7d593673a
Merge "Add a --debug-mode option to aapt." into gingerbread
2010-08-31 14:30:03 -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
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
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
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
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
Kenny Root
9a2a7a3f9a
Merge "Native libraries on SD" into gingerbread
2010-08-30 15:16:10 -07:00
Eric Laurent
44de521321
Merge "Fix issue 2952766." into gingerbread
2010-08-30 15:02:06 -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
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
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
Derek Sollenberger
bdedbf0713
Merge "Support pre-loading browser plugins on the system image." into gingerbread
2010-08-30 07:31:46 -07:00
Kenny Root
8e7ee82097
Merge "Allow native shared libraries in ASEC containers" into gingerbread
2010-08-27 16:42:28 -07:00
Brad Fitzpatrick
729f4ca190
Merge "Send broadcast intent when configured location providers change." into gingerbread
2010-08-27 16:02:21 -07:00
James Dong
9ee52948b8
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
c60754900b
Merge "Unhide camera fps range API and deprecate old ones." into gingerbread
2010-08-27 14:20:51 -07:00
Mathias Agopian
af4764d570
Merge "cleanup EGL a bit. remove unused extension." into gingerbread
2010-08-27 14:14:46 -07:00
James Dong
a75ced9ce6
Merge "Suppress the video recording start signal - bug 2950297" into gingerbread
2010-08-27 13:47:06 -07:00
