OSDN Git Service
Mike Lockwood [Wed, 17 Nov 2010 20:50:28 +0000 (12:50 -0800)]
Merge "MTP: Set correct format for abstract audio playlists"
Eric Fischer [Wed, 17 Nov 2010 20:09:30 +0000 (12:09 -0800)]
Merge "Import revised translations."
Brad Fitzpatrick [Wed, 17 Nov 2010 20:01:20 +0000 (12:01 -0800)]
Merge "More cleanups from CloseGuard reports."
Kenny Root [Wed, 17 Nov 2010 19:50:15 +0000 (11:50 -0800)]
Merge "Don't waste resources creating new Boolean objects"
Kristian Monsen [Wed, 17 Nov 2010 19:48:18 +0000 (11:48 -0800)]
Merge "Removing some js script tests from the skip list"
Tom Taylor [Wed, 17 Nov 2010 19:35:21 +0000 (11:35 -0800)]
Merge "Add a public Theme.Holo.Wallpaper.NoTitleBar"
Cary Clark [Wed, 17 Nov 2010 19:00:53 +0000 (11:00 -0800)]
Merge "don't put up a context menu while selecting text"
Jean-Michel Trivi [Wed, 17 Nov 2010 17:49:23 +0000 (09:49 -0800)]
Merge "Add new audio mode for audio communications other than telelphony."
Joe Onorato [Wed, 17 Nov 2010 05:41:33 +0000 (21:41 -0800)]
Merge "Updated layouts for new status bar"
Dianne Hackborn [Wed, 17 Nov 2010 03:36:31 +0000 (19:36 -0800)]
Merge "Fix issue #
3202866: system server crash"
Chris Tate [Wed, 17 Nov 2010 02:44:06 +0000 (18:44 -0800)]
Merge "Permission fix: don't require BACKUP perm for self-restores"
Jason Sams [Wed, 17 Nov 2010 02:30:58 +0000 (18:30 -0800)]
Merge "Fix ref counting for globals when set from java code."
Dianne Hackborn [Wed, 17 Nov 2010 02:10:48 +0000 (18:10 -0800)]
am
d28dc3cf: (-s ours) am
05434e9f: Final API 9. Really! Honestly! I hope.
* commit '
d28dc3cf7738f5574ef6359a67d68820dc6c2ad4':
Final API 9. Really! Honestly! I hope.
Jeff Sharkey [Wed, 17 Nov 2010 02:10:02 +0000 (18:10 -0800)]
Merge "Show Bitmap.Config value when unable to handle."
Vasu Nori [Wed, 17 Nov 2010 02:06:10 +0000 (18:06 -0800)]
Merge "return file uri from downloadmanager instead of content uri for public downloads"
Dianne Hackborn [Wed, 17 Nov 2010 01:49:07 +0000 (17:49 -0800)]
am
05434e9f: Final API 9. Really! Honestly! I hope.
* commit '
05434e9fa7a6ec844611bbd154c4a3eceafec538':
Final API 9. Really! Honestly! I hope.
Gilles Debunne [Wed, 17 Nov 2010 01:43:19 +0000 (17:43 -0800)]
Merge "Fix for IOOBoundsExc in SpannableStringBuilder"
Fred Quintana [Wed, 17 Nov 2010 01:36:43 +0000 (17:36 -0800)]
Merge "handle a race condition where a cursor receives an inflight onChange after the cursor has been closed"
Brad Fitzpatrick [Wed, 17 Nov 2010 01:27:43 +0000 (17:27 -0800)]
Merge "Annotate ListView with StrictMode.Span"
Patrick Dubroy [Wed, 17 Nov 2010 01:02:29 +0000 (17:02 -0800)]
Merge "Reduce amount of garbage created when flipping StackViews"
Costin Manolache [Wed, 17 Nov 2010 00:54:45 +0000 (16:54 -0800)]
Merge "Remove notifications for account when account is removed."
Amith Yamasani [Wed, 17 Nov 2010 00:47:40 +0000 (16:47 -0800)]
Merge "
3049240 TalkBack on Accessibility Options reads out passwords entered in during Lock screen"
Wink Saville [Wed, 17 Nov 2010 00:15:36 +0000 (16:15 -0800)]
Merge "Cleanup some debug output."
Andreas Huber [Wed, 17 Nov 2010 00:03:25 +0000 (16:03 -0800)]
Merge "Support post-decode video rotation."
Gil Dobjanschi [Tue, 16 Nov 2010 23:26:01 +0000 (15:26 -0800)]
Merge "Invalidate transitions when the start time or duration of an effect or overlay changes."
Adam Powell [Tue, 16 Nov 2010 23:12:41 +0000 (15:12 -0800)]
Merge "Improve docs around ActionBar as noted in bug
3111444."
Andreas Huber [Tue, 16 Nov 2010 22:50:40 +0000 (14:50 -0800)]
Merge "Apparently SystemProperties jni native support must now be registered before Binder's."
Jason Sams [Tue, 16 Nov 2010 22:24:39 +0000 (14:24 -0800)]
Merge "Fix crash with extended debugging."
Gilles Debunne [Tue, 16 Nov 2010 22:11:17 +0000 (14:11 -0800)]
Merge "Multiline EditText have top and bottom brackets to differentiate from single line."
Andreas Huber [Tue, 16 Nov 2010 21:59:02 +0000 (13:59 -0800)]
Merge "Remove all traces of legacy renderer support in stagefright."
Brad Fitzpatrick [Tue, 16 Nov 2010 21:50:07 +0000 (13:50 -0800)]
Merge "Fix more things that CloseGuard found."
Brad Fitzpatrick [Tue, 16 Nov 2010 21:33:06 +0000 (13:33 -0800)]
Merge "Fast no-op path for StrictMode.Span on user builds."
Mike Lockwood [Tue, 16 Nov 2010 19:16:03 +0000 (11:16 -0800)]
Merge "MediaScanner: Always use mime type provided to the media scanner"
Andreas Huber [Tue, 16 Nov 2010 19:13:43 +0000 (11:13 -0800)]
Merge "Make sure live streamed http live content does not start playing from the very beginning."
Eric Rowe [Tue, 16 Nov 2010 18:41:11 +0000 (10:41 -0800)]
Merge "Remove asserts in bluetooth test utils"
Eric Rowe [Tue, 16 Nov 2010 18:39:24 +0000 (10:39 -0800)]
Merge "Add acceptPair method to BT stress."
Adam Powell [Tue, 16 Nov 2010 18:27:54 +0000 (10:27 -0800)]
Merge "Fix bug
3198503 - NPE at MenuPopupHelper.dismiss"
Adam Powell [Tue, 16 Nov 2010 18:18:04 +0000 (10:18 -0800)]
Merge "Add protection for ActionMode-related window callbacks that may not implement new methods."
Brad Fitzpatrick [Tue, 16 Nov 2010 17:40:52 +0000 (09:40 -0800)]
am
8443dd16: am
383e95e2: Merge "DropBox: Read until the end of stream has been reached"
* commit '
8443dd16c2dfd5f56e33fbe76129f56e6a83b23e':
DropBox: Read until the end of stream has been reached
Brad Fitzpatrick [Tue, 16 Nov 2010 17:37:56 +0000 (09:37 -0800)]
am
383e95e2: Merge "DropBox: Read until the end of stream has been reached"
* commit '
383e95e245ceb87a2a6ad6422404ce641f0e08eb':
DropBox: Read until the end of stream has been reached
Brad Fitzpatrick [Tue, 16 Nov 2010 17:22:31 +0000 (09:22 -0800)]
Merge "DropBox: Read until the end of stream has been reached"
Xia Wang [Tue, 16 Nov 2010 17:18:48 +0000 (09:18 -0800)]
am
f55c9736: am
d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
* commit '
f55c973637f2b17de0f5543260e7e409a8635112':
Add Wi-Fi connection functional tests.
Xia Wang [Tue, 16 Nov 2010 17:16:54 +0000 (09:16 -0800)]
am
d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
* commit '
d0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
Add Wi-Fi connection functional tests.
Xia Wang [Tue, 16 Nov 2010 17:14:46 +0000 (09:14 -0800)]
Merge "Add Wi-Fi connection functional tests." into gingerbread
James Dong [Tue, 16 Nov 2010 01:59:42 +0000 (17:59 -0800)]
Merge "Add initial stereo capture support for AAC encoder"
Joe Onorato [Tue, 16 Nov 2010 01:48:33 +0000 (17:48 -0800)]
Merge "Add the quick settings panel. There's currently nothing in it."
Vasu Nori [Tue, 16 Nov 2010 01:30:00 +0000 (17:30 -0800)]
Merge "another bug introduced by some previous refactoring CL"
Stephen Hines [Tue, 16 Nov 2010 01:19:26 +0000 (17:19 -0800)]
Merge "Remove WARs for zero-init + destructors."
Michael Jurka [Tue, 16 Nov 2010 01:01:54 +0000 (17:01 -0800)]
Merge "Fix issue where Launcher was not getting redrawn"
Adam Powell [Tue, 16 Nov 2010 00:49:35 +0000 (16:49 -0800)]
Merge "Fix a couple interactions between action bar and options menus"
Joe Onorato [Tue, 16 Nov 2010 00:39:24 +0000 (16:39 -0800)]
Merge "use the proper number of wifi icon levels."
Joe Onorato [Mon, 15 Nov 2010 23:35:58 +0000 (15:35 -0800)]
Merge "Don't crash if we haven't gotten a signal strength yet."
Andreas Huber [Mon, 15 Nov 2010 23:31:17 +0000 (15:31 -0800)]
Merge "Proper support for variable NALsize lengths of AVC content in .mkv files."
Adam Powell [Mon, 15 Nov 2010 23:26:31 +0000 (15:26 -0800)]
Merge "Fix bug
3176330 - Improve documentation around MenuItem.setShowAsAction"
Gilles Debunne [Mon, 15 Nov 2010 23:23:01 +0000 (15:23 -0800)]
Merge "Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread"
Joe Onorato [Mon, 15 Nov 2010 21:32:43 +0000 (13:32 -0800)]
Merge "Don't cancel the key buttons when you drag outside their bounds."
James Dong [Mon, 15 Nov 2010 21:31:54 +0000 (13:31 -0800)]
Merge "Fixed a race condition where some recording frames may not be released."
Wink Saville [Mon, 15 Nov 2010 21:24:37 +0000 (13:24 -0800)]
Merge "Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory."
Vasu Nori [Mon, 15 Nov 2010 21:24:23 +0000 (13:24 -0800)]
Merge "map _data column to local_filename column. bug:
3197501"
Mathias Agopian [Mon, 15 Nov 2010 21:22:16 +0000 (13:22 -0800)]
am
f11bf284: am
305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
* commit '
f11bf284d355e2a8378c6a37a7ed702705ec6144':
Fix a race condition in sensormanager
Mathias Agopian [Mon, 15 Nov 2010 21:22:13 +0000 (13:22 -0800)]
am
99866c11: am
9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
* commit '
99866c111bd72a6cc9be17b127cd40ec9396ca7d':
Revert "allow all 4 orientations"
Mathias Agopian [Mon, 15 Nov 2010 21:19:46 +0000 (13:19 -0800)]
am
305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
* commit '
305bc0fe977f6197bfae847dbaf58916cf8980ba':
Fix a race condition in sensormanager
Mathias Agopian [Mon, 15 Nov 2010 21:19:43 +0000 (13:19 -0800)]
am
9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
* commit '
9e291a4b9922719165145434217e100e2118860d':
Revert "allow all 4 orientations"
Derek Sollenberger [Mon, 15 Nov 2010 21:19:37 +0000 (13:19 -0800)]
Merge "Only show double-tap tip if the feature is enabled."
Mathias Agopian [Mon, 15 Nov 2010 21:14:59 +0000 (13:14 -0800)]
Merge "Fix a race condition in sensormanager" into gingerbread
Mathias Agopian [Mon, 15 Nov 2010 21:14:50 +0000 (13:14 -0800)]
Merge "Revert "allow all 4 orientations"" into gingerbread
Joe Onorato [Mon, 15 Nov 2010 20:23:51 +0000 (12:23 -0800)]
Merge "The beginnings of the new status bar."
James Dong [Mon, 15 Nov 2010 20:13:08 +0000 (12:13 -0800)]
Merge "Switch to use kKeyFrameRate for recordvideo utility"
Brad Fitzpatrick [Mon, 15 Nov 2010 19:31:05 +0000 (11:31 -0800)]
Merge "Close some things in system_server that CloseGuard found."
Mike Lockwood [Mon, 15 Nov 2010 19:27:47 +0000 (11:27 -0800)]
Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList"
Kenny Root [Mon, 15 Nov 2010 19:11:22 +0000 (11:11 -0800)]
Merge "Split UTF functions from String8/16"
Adam Cohen [Mon, 15 Nov 2010 19:09:59 +0000 (11:09 -0800)]
Merge "Fix for Issue:
3196583"
Wink Saville [Mon, 15 Nov 2010 19:00:49 +0000 (11:00 -0800)]
Merge "Add html formatting to AsyncChannel & Hsm class comments."
Brad Fitzpatrick [Mon, 15 Nov 2010 18:47:49 +0000 (10:47 -0800)]
Merge "Disable CloseGuard early. (it defaults to spammy otherwise)"
Brad Fitzpatrick [Mon, 15 Nov 2010 18:47:32 +0000 (10:47 -0800)]
Merge "Clean up, de-dup, and speed up ContextImpl getSystemService()"
Andreas Huber [Mon, 15 Nov 2010 18:07:38 +0000 (10:07 -0800)]
Merge "More HTTP live support, AES encryption etc."
Andreas Huber [Mon, 15 Nov 2010 18:07:31 +0000 (10:07 -0800)]
Merge "Refactor h.264 profile/level support into avc_utils."
Andreas Huber [Mon, 15 Nov 2010 18:07:24 +0000 (10:07 -0800)]
Merge "Provide bandwidth estimation support in NuHTTPDataSource"
Andreas Huber [Mon, 15 Nov 2010 18:07:17 +0000 (10:07 -0800)]
Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."
Adam Cohen [Mon, 15 Nov 2010 18:05:58 +0000 (10:05 -0800)]
Merge "Adding click feedback to StackView"
James Dong [Mon, 15 Nov 2010 17:57:33 +0000 (09:57 -0800)]
Merge "Remove legacy PV stuff"
Mike Lockwood [Mon, 15 Nov 2010 17:51:10 +0000 (09:51 -0800)]
Merge "MTP: Partial implementation of the GetObjectPropList command"
Justin Ho [Mon, 15 Nov 2010 17:16:13 +0000 (09:16 -0800)]
am
b9d3e359: (-s ours) am
868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
* commit '
b9d3e35907e6b7e2c766f4813ab2e0463c920c37':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
Justin Ho [Mon, 15 Nov 2010 17:13:16 +0000 (09:13 -0800)]
am
868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
* commit '
868889fb4175979ef9aa505fc746bf616f54ed10':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
Justin Ho [Mon, 15 Nov 2010 17:10:33 +0000 (09:10 -0800)]
Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
Justin Ho [Mon, 15 Nov 2010 16:57:11 +0000 (08:57 -0800)]
am
dc04f537: (-s ours) am
a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
* commit '
dc04f53703f68f0a4fb13858cbf71b760cf48368':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
Justin Ho [Mon, 15 Nov 2010 16:53:56 +0000 (08:53 -0800)]
am
a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
* commit '
a5c4aeba1cb53775bdb5622569ffe53641f4728d':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
Justin Ho [Mon, 15 Nov 2010 16:50:19 +0000 (08:50 -0800)]
Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
Mike Lockwood [Mon, 15 Nov 2010 16:39:00 +0000 (08:39 -0800)]
Merge "MediaScanner: Add support for importing file based playlists copied over MTP"
James Dong [Mon, 15 Nov 2010 16:13:30 +0000 (08:13 -0800)]
Merge "Disable flaky streaming server check"
James Dong [Mon, 15 Nov 2010 16:11:32 +0000 (08:11 -0800)]
Merge "Fix a typo in LOG_TAG for MediaPlayer unit tests"
Ben Murdoch [Mon, 15 Nov 2010 10:33:50 +0000 (02:33 -0800)]
Merge "Stop loading if the user cancels the SSL certificate warning dialog"
Adam Powell [Sat, 13 Nov 2010 03:19:19 +0000 (19:19 -0800)]
Merge "Revised assets for progress bars and indeterminate progress spinners."
Megha Joshi [Sat, 13 Nov 2010 03:16:06 +0000 (19:16 -0800)]
am
7bcccece: (-s ours) am
e2ef2c10: Fixing build (DO NOT MERGE)
* commit '
7bcccece88734fb714c417d9d263065212f59d24':
Fixing build (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 03:13:35 +0000 (19:13 -0800)]
am
e2ef2c10: Fixing build (DO NOT MERGE)
* commit '
e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
Fixing build (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 02:48:56 +0000 (18:48 -0800)]
am
7e059716: (-s ours) am
48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '
7e059716923cd02a4c42751c67892e090bfd5f33':
Adding NFC sample resources (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 02:46:38 +0000 (18:46 -0800)]
am
48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '
48c698fc1497a01743f9ce5ab6fb8f6700847259':
Adding NFC sample resources (DO NOT MERGE)
Dianne Hackborn [Sat, 13 Nov 2010 02:18:15 +0000 (18:18 -0800)]
Merge "Change recents UIs to do task switches."
Brian Muramatsu [Fri, 12 Nov 2010 23:55:14 +0000 (15:55 -0800)]
Merge "Fix NPE in SQLiteDatabase#updateWithOnConflict"
Kenny Root [Tue, 9 Nov 2010 22:37:23 +0000 (14:37 -0800)]
Split UTF functions from String8/16
Split out all the UTF-8/16/32 handling code from String8/16 to its own
file to allow better reuse of code.
Change-Id: If9ce63920edc75472c38da4adce0d13cda9ad2f7