Eric Rowe
40677801ec
am 85d5b532: (-s ours) am f38bddbe: DO NOT MERGE Add connect HID/NAP BT stress test
...
* commit '85d5b532dd40e78844e5d9d3cce9e6583d352a1a':
DO NOT MERGE Add connect HID/NAP BT stress test
2011-01-18 22:02:46 -08:00
Eric Rowe
6fc304bacd
am 993add82: (-s ours) am a0d4d80f: DO NOT MERGE Cleaned up BT test utils
...
* commit '993add8297bb5eec254180055cc4824bbfadd18c':
DO NOT MERGE Cleaned up BT test utils
2011-01-18 22:02:40 -08:00
Romain Guy
9afbd5654d
am 3e4f4b88: am 064f6ad3: Merge "Recreate the EGL surface when ViewRoot\'s surface changes. Bug #3306150 " into honeycomb
...
* commit '3e4f4b88571a07ea08b8f6c8e98dc600dbe84f61':
Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150
2011-01-18 22:01:17 -08:00
Jason Sams
803a5ad48a
am a11b2e8a: am e70b445d: Merge "Correctly log debugging info as debug." into honeycomb
...
* commit 'a11b2e8a34b671a87dde69c4f246f8a7efb4149f':
Correctly log debugging info as debug.
2011-01-18 22:01:10 -08:00
Jason Sams
e83cdeb63b
am 17cab460: am e6a97e27: Merge "Fix race condition between GC thread and the teardown of RS. The RS context was going away while the objects were being deleted within the finializer." into honeycomb
...
* commit '17cab460b137edd4832b4b71ed4a161373ebacf2':
Fix race condition between GC thread and the teardown of RS. The RS context was going away while the objects were being deleted within the finializer.
2011-01-18 22:01:03 -08:00
Jason Sams
517eec97a1
am 752d2bf9: am 148594a0: Merge "Cleanup logs." into honeycomb
...
* commit '752d2bf9a9d9830efa056b97a408bd91f25a4a24':
Cleanup logs.
2011-01-18 22:00:57 -08:00
Guang Zhu
e58bdf3d74
am e97cc1a2: am c3db7c8f: Merge "further remove calls to runFinalization" into honeycomb
...
* commit 'e97cc1a2866cc1e3b63412e9550b8f31d5f5ac21':
further remove calls to runFinalization
2011-01-18 22:00:51 -08:00
Adam Powell
1526819427
am 6cd8a98d: am 92375756: Merge "Fix bug 3362979 - Holo light overflow button has stale focused state" into honeycomb
...
* commit '6cd8a98d6e38eddd6d7b5f1765f7acdce9144890':
Fix bug 3362979 - Holo light overflow button has stale focused state
2011-01-18 22:00:43 -08:00
Stephen Hines
52619a3a4f
am 5df7b840: am 66934423: Merge "Provide mechanism to switch between extern/static." into honeycomb
...
* commit '5df7b8404863874aa0a5e569af65ab11dfcc8281':
Provide mechanism to switch between extern/static.
2011-01-18 22:00:35 -08:00
Dianne Hackborn
375d008522
am a4605b72: am e6413270: Merge "Just a little \'ol activity manager permission change." into honeycomb
...
* commit 'a4605b72c278be829b28bfa218cdba461c1667a7':
Just a little 'ol activity manager permission change.
2011-01-18 22:00:28 -08:00
Dianne Hackborn
310ae9b39c
am fe86e979: am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
...
* commit 'fe86e9793ce62c6a1aa34e5712f16b45800efdd0':
Okay, new plan for dialogs.
2011-01-18 22:00:21 -08:00
Elliott Hughes
2b25dcc09d
am b28c5ecc: am ea6a3c70: Merge "Minor updates." into honeycomb
...
* commit 'b28c5eccabff5192d94fd59594123e8f9d450c1c':
Minor updates.
2011-01-18 22:00:14 -08:00
Adam Powell
1539a2967b
am eb7a7a04: am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
...
* commit 'eb7a7a044adba95216152e848fa692ec2869e06b':
Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
2011-01-18 22:00:06 -08:00
Mathias Agopian
e4d8b8ad29
am 246bd60e: am fc14d42b: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
...
* commit '246bd60efa89376918e5d4cd53d2ed4f9288bf8d':
fix [3361121] hang in glClear() - device unresponsive, OTA fails
2011-01-18 21:59:58 -08:00
Christopher Tate
a953359db5
am 31cd02ad: am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
...
* commit '31cd02ade3dd85c676bb278a1c2181f57179c390':
API CHANGE: add a no-View ctor for DragShadowBuilder
2011-01-18 21:58:32 -08:00
Romain Guy
7dfe1ab587
am 069f9b63: am 745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
...
* commit '069f9b6352951134a8c0b3d5320e31290e681206':
Smoother pinch-zoom in Browser.
2011-01-18 21:58:24 -08:00
Jack Palevich
1e686175a6
am 79f74eda: am a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
...
* commit '79f74eda8a6ba96519bb3a084f656fcacb1cd2e7':
Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
2011-01-18 21:58:11 -08:00
John Reck
ded2bc5c5f
am 733e2047: am c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb
...
* commit '733e2047e7dbb53d5b3b2514bfb76edbcef8a149':
Create db path if it doesn't exit
2011-01-18 21:58:01 -08:00
Nick Pelly
5a6e65ed2e
am b6b426ad: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp
...
* commit 'b6b426ad1c953555dd6393844c29be5c9a9cd700':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-18 21:57:31 -08:00
Andreas Huber
07ff585c30
am f9846fcd: am 39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
...
* commit 'f9846fcdf89432d05c713a5f356a0bd1447d3cf1':
Apparently our native TCP sockets do not return an error from blocking "connect"
2011-01-18 21:57:06 -08:00
Dianne Hackborn
7fc5d4b8e7
am 2ec5a716: am 36c84403: Merge "Fix issue #3362484 : Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
...
* commit '2ec5a7160b3d32887b2428edef7a751ee3700809':
Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog
2011-01-18 21:56:45 -08:00
Jeff Brown
7cca7e0b28
am 761a6b7f: am f4368c95: Merge "Filter virtual keys after touches." into honeycomb
...
* commit '761a6b7fdbe2bcc6db4306af9705dcb22b036068':
Filter virtual keys after touches.
2011-01-18 21:56:31 -08:00
Eric Fischer
7927859e10
am 18a7428d: (-s ours) am 2c0d22e7: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '18a7428dcb7cd3008d2c898efaaf8fe20604fdf3':
Import revised translations. DO NOT MERGE
2011-01-18 21:55:34 -08:00
James Dong
c0c48d285f
am d2225a06: am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb
...
* commit 'd2225a06a315db9988236dcf5c5bca743f6d457d':
Fix the sluggish preview during timelapse video recording because software encoder is used.
2011-01-18 21:54:39 -08:00
Costin Manolache
b8c581ec64
am bf8e1627: am b8b671df: Merge "Add back NEW_TASK flag." into honeycomb
...
* commit 'bf8e162702d0e56a8f5bf97de4c40b0a87fd78a4':
Add back NEW_TASK flag.
2011-01-18 21:54:17 -08:00
Stephen Hines
ed6b96f68a
am 780816b3: am 0e5f4e54: Merge "Validate that version pragma is correct." into honeycomb
...
* commit '780816b306876ad3e82fa5181f5d77a44720c497':
Validate that version pragma is correct.
2011-01-18 21:54:03 -08:00
Eric Laurent
4a515f1543
am 2d1362b7: am 74ff70d2: Merge "Fix typo" into honeycomb
...
* commit '2d1362b7b4c090157878212edfddba282f831502':
Fix typo
2011-01-18 21:53:48 -08:00
Kenny Root
3f56e4a53b
am 67f23166: am 11ebdd6a: Merge "Erase OBB files when removing packages" into honeycomb
...
* commit '67f23166d00d0b965d5b913bcc0cfb442c0e9506':
Erase OBB files when removing packages
2011-01-18 21:53:21 -08:00
Romain Guy
977dd49047
am 4a809367: am 553889a6: Merge "Fix 9patches, again... Bug #3365243 " into honeycomb
...
* commit '4a80936778b1e20f063df89869f089444f46797f':
Fix 9patches, again... Bug #3365243
2011-01-18 21:53:07 -08:00
Mike Lockwood
e28ef04acc
am 14032e3b: am 5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb
...
* commit '14032e3b3e9b5f31d7dd1264a8d0c79e2bc633e7':
MTP: Set modification date for abstract playlists
2011-01-18 21:52:18 -08:00
Brad Fitzpatrick
6b6156a96b
am fe384670: am 3ab249cc: Merge "Fixing memory leak in PreferenceScreen." into honeycomb
...
* commit 'fe3846707b7fbe86681e49e88c9368213f0eb16a':
Fixing memory leak in PreferenceScreen.
2011-01-18 21:52:05 -08:00
James Dong
d91ee38d51
am 1b67fec7: am 0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb
...
* commit '1b67fec7e16860d6f605f810ae422375ec3a567d':
Fix the build break in git_master-without-vendor
2011-01-18 21:51:52 -08:00
Mike Lockwood
19bb5b5a7b
am b5f08714: am 26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb
...
* commit 'b5f08714597c7a50388336480a6b72f3dc698735':
MTP: Strip ".pla" file extension from name field for WMP playlists
2011-01-18 21:51:17 -08:00
Kenny Root
83239a4693
am 189854d0: am 241fc72b: Merge "Don\'t cache return of getService in Environment" into honeycomb
...
* commit '189854d0735eae7b251d39360c9582cbcbb0a642':
Don't cache return of getService in Environment
2011-01-18 21:51:04 -08:00
Brad Fitzpatrick
aef99bbc69
am 7adf8481: am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb
...
* commit '7adf848183b39ac4d0b8b67435ace94909ca3076':
StrictMode class instance limit interface.
2011-01-18 21:50:45 -08:00
Romain Guy
68a60f8913
am a7d666ab: am 713440d2: Merge "Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #3360888 " into honeycomb
...
* commit 'a7d666ab59cab888a07065099226023745486ba2':
Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #3360888
2011-01-18 21:50:19 -08:00
Jack Palevich
0cf7ecc640
am 3ee50921: am b54407f2: Merge "Add support for preserving EGL contexts when pausing / resuming." into honeycomb
...
* commit '3ee50921957a00a91a951707aeff83208d293f2f':
Add support for preserving EGL contexts when pausing / resuming.
2011-01-18 21:50:06 -08:00
James Dong
5fb60c7af2
Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
...
bug - 3361771
Change-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9
2011-01-18 21:33:58 -08:00
Jim Miller
60ad6f0ac0
am 3355e18f: Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
...
* commit '3355e18f68c5a8fce62e783fe370afaf0899d655':
Fix 3356338: Add recovery text to AccountUnlockScreen
2011-01-18 21:17:04 -08:00
Jim Miller
3355e18f68
Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
2011-01-18 21:14:38 -08:00
Stephen Hines
dd8c9d68f9
am 688de88b: Fix bug in modf library function (plus typos).
...
* commit '688de88b65cdafc62a82a4eb2ff182fd320a0e51':
Fix bug in modf library function (plus typos).
2011-01-18 21:07:50 -08:00
Stephen Hines
688de88b65
Fix bug in modf library function (plus typos).
...
Change-Id: I643c905e2e3e2dcf7a61f1d027b749d9a0d6e542
2011-01-18 21:04:59 -08:00
Adam Powell
dd4760a2cd
am d63d3358: Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
...
* commit 'd63d33581051fdffd16789551852368d21b89fe1':
Fix bug 3362258 - Fastscroll is out of sync with the list
2011-01-18 20:46:26 -08:00
Adam Powell
d63d335810
Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
2011-01-18 20:44:44 -08:00
Andreas Huber
d5af25c624
am 63e99c39: am 529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
...
* commit '63e99c39e1e1a0dd7989bb858447b3ca76738554':
Implement parsing of vbv buffering info in RTSP.
2011-01-18 20:44:04 -08:00
Adam Powell
b1f498afc3
Fix bug 3362258 - Fastscroll is out of sync with the list
...
Change-Id: I13282bfed355f5794041e83818ee2e9e97c1b318
2011-01-18 20:44:01 -08:00
John Wang
e732ab01f0
am ae451252: am 8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
...
* commit 'ae451252f425525efd4ade9adbd023a00a89c3e7':
Enable AUTO_TIME_ZONE settings.
2011-01-18 20:43:41 -08:00
Bryan Mawhinney
e0dda5ac4a
am 6d7d0da9: am 3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb
...
* commit '6d7d0da9fb5bc52282b3d1d1fc2ac6ad8a4eb01b':
Don't report 100% buffered when the stream ends prematurely.
2011-01-18 20:43:22 -08:00
Mike Lockwood
6b280468f5
am 2bc6971d: Merge changes I7df1ff78,Ibc2e8adf into honeycomb
...
* commit '2bc6971dd82d37273b0baafeeebf3ba90d15837f':
MediaScanner: Make sure name field is set for file based playlists
MTP: Fix problem with MTP starting up on the first try.
2011-01-18 20:31:45 -08:00
Mike Lockwood
2bc6971dd8
Merge changes I7df1ff78,Ibc2e8adf into honeycomb
...
* changes:
MediaScanner: Make sure name field is set for file based playlists
MTP: Fix problem with MTP starting up on the first try.
2011-01-18 20:30:13 -08:00