James Dong
2e536e822b
Merge "Not all audio source has the drift time information" into gingerbread
2010-09-03 15:42:09 -07:00
Dianne Hackborn
38e036340e
Merge "Improve doc." into gingerbread
2010-09-03 15:15:50 -07:00
Dianne Hackborn
09a6cc531f
Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread
2010-09-03 15:07:17 -07:00
John Wang
13fbcd286d
Merge "Add API to get all foreground calls." into gingerbread
2010-09-03 14:06:20 -07:00
Adam Powell
1ec6b4c64c
Merge "Fix bug 2973252 - Make overscroll glow respect ifContentScrolls" into gingerbread
2010-09-03 13:58:37 -07:00
Andreas Huber
ce072e2e22
Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
2010-09-03 13:46:02 -07:00
Dianne Hackborn
5f6716c9d9
Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread
2010-09-03 13:24:33 -07:00
Scott Main
80d32d71b4
am c4367e54: fix code snippet error
...
Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread
* commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3':
fix code snippet error
2010-09-03 13:15:11 -07:00
Brad Fitzpatrick
962f3a99d0
Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
2010-09-03 12:46:25 -07:00
James Dong
bfa80e1fed
Merge "Better file size estimate" into gingerbread
2010-09-03 09:53:13 -07:00
Hung-ying Tyan
7657059cd1
Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
2010-09-02 19:23:31 -07:00
Scott Main
bcd7841079
am c5083cdf: Merge "clarify dp dimension description" into froyo
...
Merge commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879' into gingerbread
* commit 'c5083cdfff55a8fdcc82198273afd7dbe6379879':
clarify dp dimension description
2010-09-02 18:30:16 -07:00
James Dong
c0bb8874ee
Merge "Calculate audio media drift time from AudioSource" into gingerbread
2010-09-02 18:24:21 -07:00
Scott Main
1b8629d5ca
Merge "clarify dp dimension description" into froyo
2010-09-02 17:53:14 -07:00
Dianne Hackborn
8bc525616e
Merge "Implement #2964234 : Add support for <uses-package> element to aapt" into gingerbread
2010-09-02 17:34:31 -07:00
Kenny Root
6dfd218f7e
Merge "Add better debug output for ResourceType errors" into gingerbread
2010-09-02 15:45:52 -07:00
Gilles Debunne
f1fa4addc5
Merge "Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"" into gingerbread
2010-09-02 15:29:14 -07:00
Kenny Root
45162448b3
Add better debug output for ResourceType errors
...
An error code is returned as -ESOMETHING, but the debug code was
printing out 0x%08x for these codes making -74 print out as 0xffffffb5
which is kind of silly.
Change-Id: I7d77fb3da2e146845949f121404f662b47288e61
2010-09-02 14:58:47 -07:00
Eric Rowe
2c3659c42a
am ac3c1f55: Add BT test instrumentation for reboot tests.
...
Merge commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364' into gingerbread
* commit 'ac3c1f550f30aa793ccf5dcd0da55b070fd55364':
Add BT test instrumentation for reboot tests.
2010-09-02 14:55:47 -07:00
Gilles Debunne
3d71a05eb6
Merge "InputMethodManager showSoftInput return documentation." into gingerbread
2010-09-02 14:50:25 -07:00
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
