Brad Fitzpatrick
e22d21412f
Revert "Add length-equality test in String operator== checks."
...
This reverts commit e28210d401ae4ed1258b84c9b17a172a757190e8.
2010-10-20 17:06:28 -07:00
Jamie Gennis
ed287f4d39
Merge "Fix the non-ANW video decode path."
2010-10-20 16:04:12 -07:00
Wink Saville
150e13c4db
Merge "Add AsyncChannel and AsyncService."
2010-10-20 15:51:23 -07:00
Brad Fitzpatrick
2eabb00979
Merge "Add length-equality test in String operator== checks."
2010-10-20 15:47:04 -07:00
Andreas Huber
e16a518265
Merge "If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset()."
2010-10-20 15:13:09 -07:00
Andreas Huber
58ce2068de
Merge "Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF."
2010-10-20 15:11:02 -07:00
Brad Fitzpatrick
075e750330
Add length-equality test in String operator== checks.
...
Change-Id: I6ebc6ef85aac4539269f137c1f29f95b9828d4f9
2010-10-20 15:03:49 -07:00
Andreas Huber
9b303b9d72
Merge "Make sure we can encode the size of the codec specific data in a single byte."
2010-10-20 14:33:06 -07:00
James Dong
fcbcaa8159
Merge "Fix an issue where the video size was incorrectly retrieved from preview size"
2010-10-20 13:48:14 -07:00
Vasu Nori
0c5c40ede3
Merge "remove duplicate code"
2010-10-20 13:46:19 -07:00
Jamie Gennis
c86ff48492
Merge "Add decode-to-ANativeWindow support to Stagefright."
2010-10-20 11:38:28 -07:00
Ben Murdoch
e556862a50
Merge "Set the unique id of the AutoFill profile WebKit can read it"
2010-10-20 11:35:47 -07:00
Ben Murdoch
94b2427e42
Merge "Implement file downloads for Chrome HTTP stack (Java side)"
2010-10-20 08:36:17 -07:00
Leon Scroggins
e9b77acc54
Merge "Use primary color for matches string."
2010-10-20 06:46:48 -07:00
Jack Wang
3cbd4da6df
Merge "Added RepetitiveTest annotation and test runner support"
2010-10-20 03:23:49 -07:00
James Dong
078f5cc434
Merge "Make camera source ready for handling meta-data video buffers."
2010-10-19 23:54:57 -07:00
James Dong
e92794571f
Merge "Camera framework change required for 0-memcpy recording"
2010-10-19 23:54:38 -07:00
Patrick Dubroy
550bba75ab
Merge "Fix memory leak with TouchTargets not being recycled."
2010-10-19 18:03:46 -07:00
Adam Powell
4c8c7da1f4
Merge "Add ActionBar tab callback method onTabReselected"
2010-10-19 17:58:20 -07:00
David Deephanphongs
45e47729a2
Add missing NOTICE entries.
...
Add missing NOTICE block for TagSoup in general NOTICE file.
Add comment in Android.mk to help reviewers locate the NOTICE for apache-http.
Modify build rule for 'am' command to pull in the NOTICE file.
Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
2010-10-19 16:56:02 -07:00
Dmitri Plotnikov
a09536398a
Merge "Adding Insert.DATA extra for new/edit contact intents."
2010-10-19 15:49:25 -07:00
Gilles Debunne
11fd91e2f9
Merge "Renamed drawable-xlarge to drawable-mdpi-xlarge."
2010-10-19 14:27:13 -07:00
Gil Dobjanschi
76a03d8d4c
Merge "Finalized the audio track ducking API"
2010-10-19 14:20:04 -07:00
Chris Tate
8a28086378
Merge "Introduce an OnDragListener mechanism"
2010-10-19 13:58:07 -07:00
Brad Fitzpatrick
5a2d4572c9
am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
...
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'
* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
Fix Vibrator permission CTS test broken earlier.
2010-10-19 13:38:00 -07:00
Chris Tate
e123ef9a68
am a30c8835: (-s ours) am 18580319: DO NOT MERGE. Turn down backup logging for release.
...
Merge commit 'a30c88359f62391b77874b83825a6e400c5100b3'
* commit 'a30c88359f62391b77874b83825a6e400c5100b3':
DO NOT MERGE. Turn down backup logging for release.
2010-10-19 13:37:13 -07:00
Brad Fitzpatrick
42b6a23ef3
am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
...
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp
* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
Fix Vibrator permission CTS test broken earlier.
2010-10-19 12:25:46 -07:00
Brad Fitzpatrick
8e8732bfa9
Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread
2010-10-19 12:12:31 -07:00
Adam Powell
18b722b33f
Merge "Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw"
2010-10-19 12:04:49 -07:00
Chris Tate
eba63fd6f6
am 18580319: DO NOT MERGE. Turn down backup logging for release.
...
Merge commit '1858031946b3627b599475c5894655362e510351' into gingerbread-plus-aosp
* commit '1858031946b3627b599475c5894655362e510351':
DO NOT MERGE. Turn down backup logging for release.
2010-10-19 12:04:44 -07:00
Romain Guy
55c751599f
Merge "Solve rendering issue with embedded WebViews. Bug #3094017 "
2010-10-19 11:46:15 -07:00
James Dong
1c71a5af5f
Merge "Camera hal change for 0-memcpy in media recording framework"
2010-10-19 11:25:19 -07:00
Andreas Huber
d842f5be71
am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
...
Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'
* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
If we encounter video stream EOS while seeking we may still need to seek audio.
2010-10-19 11:19:55 -07:00
Kenny Root
b97d1ad03d
am c0e97872: am 928b0748: Merge "Don\'t symlink native library paths for old apps" into gingerbread
...
Merge commit 'c0e9787293b761b04bdb07908751b22458f17bbc'
* commit 'c0e9787293b761b04bdb07908751b22458f17bbc':
Don't symlink native library paths for old apps
2010-10-19 11:19:45 -07:00
Wu-cheng Li
857744ff53
am 9bf511db: am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread
...
Merge commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188'
* commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188':
Fix some camera orientation javadoc errors.
2010-10-19 11:19:15 -07:00
Chung-yih Wang
c5e87dfa28
am cd6fe63f: am b4116c09: Fix the incorrect environment variable name for the thread pool size.
...
Merge commit 'cd6fe63fdc2e99da11b19a233afd81e2448d0db2'
* commit 'cd6fe63fdc2e99da11b19a233afd81e2448d0db2':
Fix the incorrect environment variable name for the thread pool size.
2010-10-19 11:18:42 -07:00
Sylvain Fonteneau
e727579ea8
am 824de4b3: am dd7341f7: Added missing implementation for NdefRecord.
...
Merge commit '824de4b3e378a5ef41de1704ee3f50a49d408a66'
* commit '824de4b3e378a5ef41de1704ee3f50a49d408a66':
Added missing implementation for NdefRecord.
2010-10-19 11:17:52 -07:00
Jean-Baptiste Queru
08378262e4
Skip 494ec19e from gingerbread-plus-aosp (already cherry-picked)
...
Change-Id: I319738dccfeb0be82fed2bcc58eb425b222bc0fa
2010-10-19 10:51:58 -07:00
Jean-Baptiste Queru
7b4c5dc6fb
Skip 69a19fdb from gingerbread-plsu-aosp - already in master
...
Change-Id: I9450aeb7526bf551230389aecbda9926e2f5b3f8
2010-10-19 10:48:26 -07:00
Brad Fitzpatrick
f285fd62fb
am c9cff071: am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread
...
Merge commit 'c9cff071af175e559339c54876136612ac5eda3b'
* commit 'c9cff071af175e559339c54876136612ac5eda3b':
StrictMode: fix docs to actually compile and add a utility method.
2010-10-19 10:44:52 -07:00
Shimeng (Simon) Wang
c12af7f61a
am b65058a4: am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread
...
Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5'
* commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5':
Don't force ended when full screen video is returned manually.
2010-10-19 10:44:46 -07:00
Andreas Huber
15fc430e9a
am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
...
Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp
* commit '52bea277ff92a2a1780e035c82c72082434e7b16':
If we encounter video stream EOS while seeking we may still need to seek audio.
2010-10-19 10:08:32 -07:00
Andreas Huber
7961f288be
Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
2010-10-19 09:59:01 -07:00
Nick Pelly
85e98899ab
am 7dced8de: am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread
...
Merge commit '7dced8de3813aa42edb59e13e3ea3a2657d06125'
* commit '7dced8de3813aa42edb59e13e3ea3a2657d06125':
NFC: broadcast intent constants for adapter state change
2010-10-19 09:56:01 -07:00
Nick Pelly
c2c020f218
am 38476ef2: am 8f1e7b62: Merge "Cleanspec to fix incremental build failures of the form:" into gingerbread
...
Merge commit '38476ef2f1bc5d8c3540382ea792f709d0b61faf'
* commit '38476ef2f1bc5d8c3540382ea792f709d0b61faf':
Cleanspec to fix incremental build failures of the form:
2010-10-19 09:55:52 -07:00
Mike Lockwood
19f81d0de8
am 8333d591: am 5d5a9db5: Merge "GPS: Enable some more logging" into gingerbread
...
Merge commit '8333d59133da8e56cfb5465c767e89c61ede28bc'
* commit '8333d59133da8e56cfb5465c767e89c61ede28bc':
GPS: Enable some more logging
2010-10-19 09:55:45 -07:00
Jeff Brown
2659f40403
am f2c40603: am 7689dd49: Merge "Fix bug where home presses were not poking user activity." into gingerbread
...
Merge commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e'
* commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e':
Fix bug where home presses were not poking user activity.
2010-10-19 09:55:39 -07:00
Andreas Huber
7a505628df
am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.
...
Merge commit '8b5161c2aed8637de9bffb1d81298d60ea237caf'
* commit '8b5161c2aed8637de9bffb1d81298d60ea237caf':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
2010-10-19 09:55:31 -07:00
Adam Powell
5964e7e9b1
am 6018745f: (-s ours) am 9f85ef4a: Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread
...
Merge commit '6018745fb7d61f456f3fd96e79d03de28cd40a07'
* commit '6018745fb7d61f456f3fd96e79d03de28cd40a07':
DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
2010-10-19 09:54:53 -07:00
Mike Lockwood
2ecd878609
am 11eada78: am ba2ec2b4: Merge "Enable framework GPS and location manager logging" into gingerbread
...
Merge commit '11eada780dc82fcac2a1dad4e2dde1d310b4231c'
* commit '11eada780dc82fcac2a1dad4e2dde1d310b4231c':
Enable framework GPS and location manager logging
2010-10-19 09:54:42 -07:00