OSDN Git Service
Eric Rowe [Wed, 19 Jan 2011 06:02:40 +0000 (22:02 -0800)]
am
993add82: (-s ours) am
a0d4d80f: DO NOT MERGE Cleaned up BT test utils
* commit '
993add8297bb5eec254180055cc4824bbfadd18c':
DO NOT MERGE Cleaned up BT test utils
Romain Guy [Wed, 19 Jan 2011 06:01:17 +0000 (22:01 -0800)]
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
Jason Sams [Wed, 19 Jan 2011 06:01:10 +0000 (22:01 -0800)]
am
a11b2e8a: am
e70b445d: Merge "Correctly log debugging info as debug." into honeycomb
* commit '
a11b2e8a34b671a87dde69c4f246f8a7efb4149f':
Correctly log debugging info as debug.
Jason Sams [Wed, 19 Jan 2011 06:01:03 +0000 (22:01 -0800)]
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.
Jason Sams [Wed, 19 Jan 2011 06:00:57 +0000 (22:00 -0800)]
am
752d2bf9: am
148594a0: Merge "Cleanup logs." into honeycomb
* commit '
752d2bf9a9d9830efa056b97a408bd91f25a4a24':
Cleanup logs.
Guang Zhu [Wed, 19 Jan 2011 06:00:51 +0000 (22:00 -0800)]
am
e97cc1a2: am
c3db7c8f: Merge "further remove calls to runFinalization" into honeycomb
* commit '
e97cc1a2866cc1e3b63412e9550b8f31d5f5ac21':
further remove calls to runFinalization
Adam Powell [Wed, 19 Jan 2011 06:00:43 +0000 (22:00 -0800)]
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
Stephen Hines [Wed, 19 Jan 2011 06:00:35 +0000 (22:00 -0800)]
am
5df7b840: am
66934423: Merge "Provide mechanism to switch between extern/static." into honeycomb
* commit '
5df7b8404863874aa0a5e569af65ab11dfcc8281':
Provide mechanism to switch between extern/static.
Dianne Hackborn [Wed, 19 Jan 2011 06:00:28 +0000 (22:00 -0800)]
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.
Dianne Hackborn [Wed, 19 Jan 2011 06:00:21 +0000 (22:00 -0800)]
am
fe86e979: am
661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
* commit '
fe86e9793ce62c6a1aa34e5712f16b45800efdd0':
Okay, new plan for dialogs.
Elliott Hughes [Wed, 19 Jan 2011 06:00:14 +0000 (22:00 -0800)]
am
b28c5ecc: am
ea6a3c70: Merge "Minor updates." into honeycomb
* commit '
b28c5eccabff5192d94fd59594123e8f9d450c1c':
Minor updates.
Adam Powell [Wed, 19 Jan 2011 06:00:06 +0000 (22:00 -0800)]
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
Mathias Agopian [Wed, 19 Jan 2011 05:59:58 +0000 (21:59 -0800)]
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
Christopher Tate [Wed, 19 Jan 2011 05:58:32 +0000 (21:58 -0800)]
am
31cd02ad: am
17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
* commit '
31cd02ade3dd85c676bb278a1c2181f57179c390':
API CHANGE: add a no-View ctor for DragShadowBuilder
Romain Guy [Wed, 19 Jan 2011 05:58:24 +0000 (21:58 -0800)]
am
069f9b63: am
745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
* commit '
069f9b6352951134a8c0b3d5320e31290e681206':
Smoother pinch-zoom in Browser.
Jack Palevich [Wed, 19 Jan 2011 05:58:11 +0000 (21:58 -0800)]
am
79f74eda: am
a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
* commit '
79f74eda8a6ba96519bb3a084f656fcacb1cd2e7':
Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
John Reck [Wed, 19 Jan 2011 05:58:01 +0000 (21:58 -0800)]
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
Nick Pelly [Wed, 19 Jan 2011 05:57:31 +0000 (21:57 -0800)]
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)
Andreas Huber [Wed, 19 Jan 2011 05:57:06 +0000 (21:57 -0800)]
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"
Dianne Hackborn [Wed, 19 Jan 2011 05:56:45 +0000 (21:56 -0800)]
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
Jeff Brown [Wed, 19 Jan 2011 05:56:31 +0000 (21:56 -0800)]
am
761a6b7f: am
f4368c95: Merge "Filter virtual keys after touches." into honeycomb
* commit '
761a6b7fdbe2bcc6db4306af9705dcb22b036068':
Filter virtual keys after touches.
Eric Fischer [Wed, 19 Jan 2011 05:55:34 +0000 (21:55 -0800)]
am
18a7428d: (-s ours) am
2c0d22e7: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
18a7428dcb7cd3008d2c898efaaf8fe20604fdf3':
Import revised translations. DO NOT MERGE
James Dong [Wed, 19 Jan 2011 05:54:39 +0000 (21:54 -0800)]
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.
Costin Manolache [Wed, 19 Jan 2011 05:54:17 +0000 (21:54 -0800)]
am
bf8e1627: am
b8b671df: Merge "Add back NEW_TASK flag." into honeycomb
* commit '
bf8e162702d0e56a8f5bf97de4c40b0a87fd78a4':
Add back NEW_TASK flag.
Stephen Hines [Wed, 19 Jan 2011 05:54:03 +0000 (21:54 -0800)]
am
780816b3: am
0e5f4e54: Merge "Validate that version pragma is correct." into honeycomb
* commit '
780816b306876ad3e82fa5181f5d77a44720c497':
Validate that version pragma is correct.
Eric Laurent [Wed, 19 Jan 2011 05:53:48 +0000 (21:53 -0800)]
am
2d1362b7: am
74ff70d2: Merge "Fix typo" into honeycomb
* commit '
2d1362b7b4c090157878212edfddba282f831502':
Fix typo
Kenny Root [Wed, 19 Jan 2011 05:53:21 +0000 (21:53 -0800)]
am
67f23166: am
11ebdd6a: Merge "Erase OBB files when removing packages" into honeycomb
* commit '
67f23166d00d0b965d5b913bcc0cfb442c0e9506':
Erase OBB files when removing packages
Romain Guy [Wed, 19 Jan 2011 05:53:07 +0000 (21:53 -0800)]
am
4a809367: am
553889a6: Merge "Fix 9patches, again... Bug #
3365243" into honeycomb
* commit '
4a80936778b1e20f063df89869f089444f46797f':
Fix 9patches, again... Bug #
3365243
Mike Lockwood [Wed, 19 Jan 2011 05:52:18 +0000 (21:52 -0800)]
am
14032e3b: am
5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb
* commit '
14032e3b3e9b5f31d7dd1264a8d0c79e2bc633e7':
MTP: Set modification date for abstract playlists
Brad Fitzpatrick [Wed, 19 Jan 2011 05:52:05 +0000 (21:52 -0800)]
am
fe384670: am
3ab249cc: Merge "Fixing memory leak in PreferenceScreen." into honeycomb
* commit '
fe3846707b7fbe86681e49e88c9368213f0eb16a':
Fixing memory leak in PreferenceScreen.
James Dong [Wed, 19 Jan 2011 05:51:52 +0000 (21:51 -0800)]
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
Mike Lockwood [Wed, 19 Jan 2011 05:51:17 +0000 (21:51 -0800)]
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
Kenny Root [Wed, 19 Jan 2011 05:51:04 +0000 (21:51 -0800)]
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
Brad Fitzpatrick [Wed, 19 Jan 2011 05:50:45 +0000 (21:50 -0800)]
am
7adf8481: am
b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb
* commit '
7adf848183b39ac4d0b8b67435ace94909ca3076':
StrictMode class instance limit interface.
Romain Guy [Wed, 19 Jan 2011 05:50:19 +0000 (21:50 -0800)]
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
Jack Palevich [Wed, 19 Jan 2011 05:50:06 +0000 (21:50 -0800)]
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.
Andreas Huber [Wed, 19 Jan 2011 04:44:04 +0000 (20:44 -0800)]
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.
John Wang [Wed, 19 Jan 2011 04:43:41 +0000 (20:43 -0800)]
am
ae451252: am
8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
* commit '
ae451252f425525efd4ade9adbd023a00a89c3e7':
Enable AUTO_TIME_ZONE settings.
Bryan Mawhinney [Wed, 19 Jan 2011 04:43:22 +0000 (20:43 -0800)]
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.
Eric Rowe [Wed, 19 Jan 2011 03:06:34 +0000 (19:06 -0800)]
am
a0d4d80f: DO NOT MERGE Cleaned up BT test utils
* commit '
a0d4d80fd2feaa04cb5f5242acd159cd783b25d4':
DO NOT MERGE Cleaned up BT test utils
Romain Guy [Wed, 19 Jan 2011 02:41:29 +0000 (18:41 -0800)]
am
064f6ad3: Merge "Recreate the EGL surface when ViewRoot\'s surface changes. Bug #
3306150" into honeycomb
* commit '
064f6ad3928c51996359694c00a580115b2dabfc':
Recreate the EGL surface when ViewRoot's surface changes. Bug #
3306150
Jason Sams [Wed, 19 Jan 2011 02:41:22 +0000 (18:41 -0800)]
am
e70b445d: Merge "Correctly log debugging info as debug." into honeycomb
* commit '
e70b445d2fb128b831b84408f0c9f2b499918ced':
Correctly log debugging info as debug.
Jason Sams [Wed, 19 Jan 2011 02:41:14 +0000 (18:41 -0800)]
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 '
e6a97e27bcc1b8320fbe09d7827aec8050ebef01':
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.
Jason Sams [Wed, 19 Jan 2011 02:41:04 +0000 (18:41 -0800)]
am
148594a0: Merge "Cleanup logs." into honeycomb
* commit '
148594a0151ddf4978a9d796b5541cca3407fb89':
Cleanup logs.
Guang Zhu [Wed, 19 Jan 2011 02:40:55 +0000 (18:40 -0800)]
am
c3db7c8f: Merge "further remove calls to runFinalization" into honeycomb
* commit '
c3db7c8f3bc9af38d0f4ad2c66ff696c115c036a':
further remove calls to runFinalization
Adam Powell [Wed, 19 Jan 2011 02:40:51 +0000 (18:40 -0800)]
am
92375756: Merge "Fix bug
3362979 - Holo light overflow button has stale focused state" into honeycomb
* commit '
923757567ec834c0a1e2c68f4951990046e6e3c1':
Fix bug
3362979 - Holo light overflow button has stale focused state
Stephen Hines [Wed, 19 Jan 2011 02:40:39 +0000 (18:40 -0800)]
am
66934423: Merge "Provide mechanism to switch between extern/static." into honeycomb
* commit '
66934423c8d398b7d0661bba6dba0ddcab2352e3':
Provide mechanism to switch between extern/static.
Dianne Hackborn [Wed, 19 Jan 2011 02:40:29 +0000 (18:40 -0800)]
am
e6413270: Merge "Just a little \'ol activity manager permission change." into honeycomb
* commit '
e64132705279fea1769af3e5ef5c7384a2fef5d4':
Just a little 'ol activity manager permission change.
Dianne Hackborn [Wed, 19 Jan 2011 02:40:22 +0000 (18:40 -0800)]
am
661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
* commit '
661b6cfb2bcecdd335540db7059e5d8e22c2e79a':
Okay, new plan for dialogs.
Elliott Hughes [Wed, 19 Jan 2011 02:39:36 +0000 (18:39 -0800)]
am
ea6a3c70: Merge "Minor updates." into honeycomb
* commit '
ea6a3c706ada7db1abeda609aa5d1ba9209c7f2b':
Minor updates.
Adam Powell [Wed, 19 Jan 2011 02:39:10 +0000 (18:39 -0800)]
am
6cfc7a0a: Merge "Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
* commit '
6cfc7a0acb0d3b202ae1dbee88e7e8bdfaee5590':
Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing
Mathias Agopian [Wed, 19 Jan 2011 02:39:02 +0000 (18:39 -0800)]
am
fc14d42b: Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
* commit '
fc14d42b75d25b5062613333331839c895621f3b':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails
Christopher Tate [Wed, 19 Jan 2011 02:36:06 +0000 (18:36 -0800)]
am
17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
* commit '
17ed60c3d2e480ab9788b445958a22b9ae7b6e96':
API CHANGE: add a no-View ctor for DragShadowBuilder
Romain Guy [Wed, 19 Jan 2011 02:35:50 +0000 (18:35 -0800)]
am
745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
* commit '
745a529249c346656a404e38333f6d0ce6503fd7':
Smoother pinch-zoom in Browser.
Jack Palevich [Wed, 19 Jan 2011 02:35:42 +0000 (18:35 -0800)]
am
a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
* commit '
a228e4f833b96e0633571735c2363e30363e155c':
Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
John Reck [Wed, 19 Jan 2011 02:35:35 +0000 (18:35 -0800)]
am
c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb
* commit '
c098c1d348a183635561c504ccd67a9014a45475':
Create db path if it doesn't exit
Eric Rowe [Sat, 4 Dec 2010 02:22:49 +0000 (18:22 -0800)]
DO NOT MERGE Cleaned up BT test utils
Change-Id: I905a468a04b5730258a9e6525165e4c4013d30c8
Romain Guy [Wed, 19 Jan 2011 02:26:22 +0000 (18:26 -0800)]
Merge "Recreate the EGL surface when ViewRoot's surface changes. Bug #
3306150" into honeycomb
Romain Guy [Wed, 19 Jan 2011 02:28:21 +0000 (18:28 -0800)]
Recreate the EGL surface when ViewRoot's surface changes.
Bug #
3306150
Change-Id: Ifbf0ab9deca7a34eff7d844ea7276d12d7284788
Jason Sams [Wed, 19 Jan 2011 02:22:56 +0000 (18:22 -0800)]
Merge "Correctly log debugging info as debug." into honeycomb
Jason Sams [Wed, 19 Jan 2011 02:22:19 +0000 (18:22 -0800)]
Correctly log debugging info as debug.
Change-Id: I1169e015288d7d91b7ecbdd991e815152740e68d
Jason Sams [Wed, 19 Jan 2011 02:18:06 +0000 (18:18 -0800)]
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
Jason Sams [Wed, 19 Jan 2011 02:13:07 +0000 (18:13 -0800)]
Merge "Cleanup logs." into honeycomb
Jason Sams [Wed, 19 Jan 2011 02:12:26 +0000 (18:12 -0800)]
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.
Add more debugging for playCoreCommands.
Change-Id: I391f0b4db948f43f54017b47b062ab47d6a1ef64
Guang Zhu [Wed, 19 Jan 2011 02:05:50 +0000 (18:05 -0800)]
Merge "further remove calls to runFinalization" into honeycomb
Guang Zhu [Wed, 19 Jan 2011 02:04:34 +0000 (18:04 -0800)]
further remove calls to runFinalization
apparently these calls may deadlock as well...
Change-Id: I83132aa50f4e49a170be2b960f6c3236f14745c9
Adam Powell [Wed, 19 Jan 2011 02:03:23 +0000 (18:03 -0800)]
Merge "Fix bug
3362979 - Holo light overflow button has stale focused state" into honeycomb
Adam Powell [Wed, 19 Jan 2011 02:02:39 +0000 (18:02 -0800)]
Fix bug
3362979 - Holo light overflow button has stale focused state
Change-Id: Id16dbbe2e800109b3cc2b491f3cd2c1e19c3bac2
Stephen Hines [Wed, 19 Jan 2011 01:50:19 +0000 (17:50 -0800)]
Merge "Provide mechanism to switch between extern/static." into honeycomb
Dianne Hackborn [Wed, 19 Jan 2011 01:49:05 +0000 (17:49 -0800)]
Merge "Just a little 'ol activity manager permission change." into honeycomb
Dianne Hackborn [Wed, 19 Jan 2011 01:48:22 +0000 (17:48 -0800)]
Merge "Okay, new plan for dialogs." into honeycomb
Dianne Hackborn [Wed, 19 Jan 2011 01:35:17 +0000 (17:35 -0800)]
Okay, new plan for dialogs.
Don't dismiss by default when tapping outside, even for AlertDialog.
If AlertDialog doesn't have any buttons, tapping outside will dismiss it.
Applications can make their own dialogs (or activities looking like
dialogs) can use the existing and new APIs to control this behavior
themselves so that it does the right thing.
Change-Id: I02bfb9161e169de0033200211b3a7ec80080bd83
Elliott Hughes [Wed, 19 Jan 2011 01:25:05 +0000 (17:25 -0800)]
Merge "Minor updates." into honeycomb
Elliott Hughes [Wed, 19 Jan 2011 01:13:06 +0000 (17:13 -0800)]
Minor updates.
Take into account Gingerbread JIT and GC improvements.
Change-Id: I170def3ac1ecac0ba88258b8d6bfdd77cb2f7f9a
Dianne Hackborn [Wed, 19 Jan 2011 01:02:33 +0000 (17:02 -0800)]
Just a little 'ol activity manager permission change.
We no longer enforce permissions for applications that are accessing
their own components. This allows an application to require a permission
on one of its components that it does not itself have. This is useful
for example with the new advanced widgets, which require a system-only
permission on the implementing service to ensure the app's data stays
private but it is nice to allow the application to still touch its own
widget service.
Change-Id: I5d61930a083816919545870039ad191314ed48c6
Adam Powell [Wed, 19 Jan 2011 00:57:59 +0000 (16:57 -0800)]
Merge "Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
Stephen Hines [Wed, 19 Jan 2011 00:53:19 +0000 (16:53 -0800)]
Provide mechanism to switch between extern/static.
Change-Id: I59b1b45cc335278f92b68581594ca68115b9a590
Mathias Agopian [Wed, 19 Jan 2011 00:52:33 +0000 (16:52 -0800)]
Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
Adam Powell [Wed, 19 Jan 2011 00:51:22 +0000 (16:51 -0800)]
Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing
Change-Id: I9e7ec4ab14c6008397d26c499ccf478f8875f918
Nick Pelly [Wed, 19 Jan 2011 00:10:48 +0000 (16:10 -0800)]
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp
Gloria Wang [Wed, 19 Jan 2011 00:09:44 +0000 (16:09 -0800)]
Merge "rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/"
Christopher Tate [Tue, 18 Jan 2011 20:50:26 +0000 (12:50 -0800)]
API CHANGE: add a no-View ctor for DragShadowBuilder
Cf conversation with the API council. Also expand the javadoc
a bit.
Change-Id: I9d4edb1042e00492b3db5c6bb7c7d9648581efad
Romain Guy [Tue, 18 Jan 2011 23:55:31 +0000 (15:55 -0800)]
Merge "Smoother pinch-zoom in Browser." into honeycomb
Jack Palevich [Tue, 18 Jan 2011 23:54:29 +0000 (15:54 -0800)]
Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
John Reck [Tue, 18 Jan 2011 23:53:33 +0000 (15:53 -0800)]
Merge "Create db path if it doesn't exit" into honeycomb
Jack Palevich [Tue, 18 Jan 2011 23:53:25 +0000 (15:53 -0800)]
Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
Change-Id: I882b8fa7888e2baae41c81b75af7fc1f639d38d6
Mathias Agopian [Tue, 18 Jan 2011 23:51:30 +0000 (15:51 -0800)]
fix [
3361121] hang in glClear() - device unresponsive, OTA fails
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.
The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.
This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.
Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.
Change-Id: I1f226b1ebdf6918439b687c2723955d55b842c55
Romain Guy [Tue, 18 Jan 2011 23:41:44 +0000 (15:41 -0800)]
Smoother pinch-zoom in Browser.
Change-Id: Ie5a403b76ab25483a980324cd7b31976359fa796
John Reck [Tue, 18 Jan 2011 23:42:49 +0000 (15:42 -0800)]
Create db path if it doesn't exit
Bug:
3241808
Make sure the directory the caller is trying to open the icon db
in actually exists and create it if it doesn't.
Change-Id: Ie5e4a09210e9430edc318846a551542119969053
Nick Pelly [Mon, 10 Jan 2011 06:26:59 +0000 (17:26 +1100)]
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
The later feels less clumsy.
Change-Id: I1bad37031c5d57f51b04c8ea6e41805dcd2935ec
Andreas Huber [Tue, 18 Jan 2011 23:37:58 +0000 (15:37 -0800)]
am
39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
* commit '
39560507215774873ba64b5f0ff61648488924ea':
Apparently our native TCP sockets do not return an error from blocking "connect"
Andreas Huber [Tue, 18 Jan 2011 23:35:35 +0000 (15:35 -0800)]
Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
Dianne Hackborn [Tue, 18 Jan 2011 23:32:44 +0000 (15:32 -0800)]
am
36c84403: Merge "Fix issue #
3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
* commit '
36c84403ec07439d11ed284ac5f9a9db807fbf92':
Fix issue #
3362484: Can't dismiss activity picker by tapping outside dialog
Dianne Hackborn [Tue, 18 Jan 2011 23:31:21 +0000 (15:31 -0800)]
Merge "Fix issue #
3362484: Can't dismiss activity picker by tapping outside dialog" into honeycomb
Jeff Brown [Tue, 18 Jan 2011 23:29:28 +0000 (15:29 -0800)]
am
f4368c95: Merge "Filter virtual keys after touches." into honeycomb
* commit '
f4368c959fa9436d75feb2543cb65da0d46521e5':
Filter virtual keys after touches.
Dianne Hackborn [Tue, 18 Jan 2011 21:57:54 +0000 (13:57 -0800)]
Fix issue #
3362484: Can't dismiss activity picker by tapping outside dialog
Change-Id: Idc2fe5a86c61e8f94fe9d902a0087a05f6f7918e
Andreas Huber [Tue, 18 Jan 2011 23:26:40 +0000 (15:26 -0800)]
Apparently our native TCP sockets do not return an error from blocking "connect"
if the network interface is shutdown while connecting.
Change-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0
related-to-bug:
3362836
Jeff Brown [Tue, 18 Jan 2011 23:26:15 +0000 (15:26 -0800)]
Merge "Filter virtual keys after touches." into honeycomb
Gloria Wang [Tue, 18 Jan 2011 23:23:51 +0000 (15:23 -0800)]
rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/
Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
Eric Fischer [Tue, 18 Jan 2011 23:16:59 +0000 (15:16 -0800)]
am
2c0d22e7: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
2c0d22e72c0e3fa1705e39eeaedfdbad89a785ce':
Import revised translations. DO NOT MERGE