OSDN Git Service
Gilles Debunne [Thu, 27 Jan 2011 02:10:58 +0000 (18:10 -0800)]
am
bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
* commit '
bc3f79371bb93e075bcb91d92180487337afce17':
Tabs are resized to make sure they fit in their parent.
Gilles Debunne [Thu, 27 Jan 2011 02:09:23 +0000 (18:09 -0800)]
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
Jaikumar Ganesh [Thu, 27 Jan 2011 02:03:40 +0000 (18:03 -0800)]
am
55271a79: Merge "Disable PBAP for no voice capability" into honeycomb
* commit '
55271a79d1c14e2952d550995569135a23971672':
Disable PBAP for no voice capability
Shih-wei Liao [Thu, 27 Jan 2011 02:03:31 +0000 (18:03 -0800)]
am
b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/
2943524)" into honeycomb
* commit '
b9d69d595fa17ae87b4e615c2339df64a5df8324':
For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/
2943524)
Dianne Hackborn [Thu, 27 Jan 2011 02:03:18 +0000 (18:03 -0800)]
am
14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
14cd455dd57f2708b63f88aab24ba6c75d13d96f':
Import revised translations. DO NOT MERGE
Scott Main [Thu, 27 Jan 2011 01:58:54 +0000 (17:58 -0800)]
am
bedd2427: am
a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit '
bedd242768f7594d12bde0b4c4e7d153c27858d4':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
Scott Main [Thu, 27 Jan 2011 01:56:26 +0000 (17:56 -0800)]
am
a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit '
a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
Jaikumar Ganesh [Thu, 27 Jan 2011 01:52:50 +0000 (17:52 -0800)]
Merge "Disable PBAP for no voice capability" into honeycomb
Scott Main [Thu, 27 Jan 2011 01:52:08 +0000 (17:52 -0800)]
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
Shih-wei Liao [Thu, 27 Jan 2011 01:43:13 +0000 (17:43 -0800)]
Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/
2943524)" into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 01:38:57 +0000 (17:38 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Wink Saville [Thu, 27 Jan 2011 01:32:10 +0000 (17:32 -0800)]
am
13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
* commit '
13a8f2a59c063b988502de9b7197d83b5db487d9':
Comment out the isAvailable optimization.
Wink Saville [Thu, 27 Jan 2011 01:29:32 +0000 (17:29 -0800)]
Merge "Comment out the isAvailable optimization." into honeycomb
Scott Main [Thu, 27 Jan 2011 01:09:21 +0000 (17:09 -0800)]
am
0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the info to the R
* commit '
0f2e2b8b82c7b589bcc603ce57f8ff3d1c947784':
Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
Scott Main [Thu, 27 Jan 2011 01:06:45 +0000 (17:06 -0800)]
Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description." into honeycomb
Andreas Huber [Thu, 27 Jan 2011 00:58:04 +0000 (16:58 -0800)]
am
586096a9: (-s ours) am
2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '
586096a9575a52ea7fa318f6f8540b47ba2ed2e8':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Jeff Brown [Thu, 27 Jan 2011 00:57:38 +0000 (16:57 -0800)]
am
91f2dbb7: (-s ours) am
7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
* commit '
91f2dbb7825af8fbef1ce5db1f42d3171d7487ce':
Move keymaps from sdk/emulator/keymaps.
Xavier Ducrohet [Thu, 27 Jan 2011 00:54:31 +0000 (16:54 -0800)]
am
ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
* commit '
ee37ab8dce5fe60d9a2af411ae9e38e3e44589ed':
LayoutLib: properly erase the bitmap when rendering a new session.
Xavier Ducrohet [Thu, 27 Jan 2011 00:52:49 +0000 (16:52 -0800)]
Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
Andreas Huber [Thu, 27 Jan 2011 00:40:04 +0000 (16:40 -0800)]
am
2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '
2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Dianne Hackborn [Thu, 27 Jan 2011 00:30:54 +0000 (16:30 -0800)]
am
93257271: Merge "Remove xlarge specific icon size" into honeycomb
* commit '
93257271add728749a181e0580f2e71f3c4f129c':
Remove xlarge specific icon size
Dianne Hackborn [Thu, 27 Jan 2011 00:30:49 +0000 (16:30 -0800)]
am
8c0ac870: Merge "Fix another part of #
3387855: Menu flashes on left side of screen" into honeycomb
* commit '
8c0ac8708761872082c75aedc5fa4b25d1286fd0':
Fix another part of #
3387855: Menu flashes on left side of screen
Dianne Hackborn [Thu, 27 Jan 2011 00:28:46 +0000 (16:28 -0800)]
Merge "Remove xlarge specific icon size" into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 00:28:38 +0000 (16:28 -0800)]
am
2d63144e: Merge "Fix issue #
3380072: Switching in and out of gmail not preserving position in label" into honeycomb
* commit '
2d63144ed94dff0832d051ec355f56649244dd4e':
Fix issue #
3380072: Switching in and out of gmail not preserving position in label
Dianne Hackborn [Thu, 27 Jan 2011 00:27:40 +0000 (16:27 -0800)]
Merge "Fix another part of #
3387855: Menu flashes on left side of screen" into honeycomb
Mike Lockwood [Thu, 27 Jan 2011 00:26:26 +0000 (16:26 -0800)]
am
278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
* commit '
278a04eb7a56459c2f9e3b47dcced6522a87f1d1':
Fix javadoc for MediaStore.Files.FileColumns constants
Dianne Hackborn [Thu, 27 Jan 2011 00:25:49 +0000 (16:25 -0800)]
Merge "Fix issue #
3380072: Switching in and out of gmail not preserving position in label" into honeycomb
Mike Lockwood [Thu, 27 Jan 2011 00:24:19 +0000 (16:24 -0800)]
Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
Winson Chung [Thu, 27 Jan 2011 00:14:03 +0000 (16:14 -0800)]
am
b90a91c6: Making requested indices the last to be pruned when we hit cache memory limits. (
3368863)
* commit '
b90a91c633e99d4559095184af27d1416541d3c0':
Making requested indices the last to be pruned when we hit cache memory limits. (
3368863)
Andreas Huber [Wed, 26 Jan 2011 23:52:48 +0000 (15:52 -0800)]
am
63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
* commit '
63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Jim Miller [Wed, 26 Jan 2011 23:50:41 +0000 (15:50 -0800)]
am
85433c76: Merge "Fix
3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
* commit '
85433c76066843d20c92c90d64e842e4f14dbac8':
Fix
3354590: Add back button to dismiss RecentAppsPanel
Andreas Huber [Wed, 26 Jan 2011 23:50:04 +0000 (15:50 -0800)]
Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
Jim Miller [Wed, 26 Jan 2011 23:47:40 +0000 (15:47 -0800)]
Merge "Fix
3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
Romain Guy [Wed, 26 Jan 2011 23:43:09 +0000 (15:43 -0800)]
am
9e7c2c6d: Merge "Optimize invalidate() calls." into honeycomb
* commit '
9e7c2c6ded1144122915cfb8bd663e789c7eb93b':
Optimize invalidate() calls.
Fabrice Di Meglio [Wed, 26 Jan 2011 23:42:55 +0000 (15:42 -0800)]
am
f728411b: Merge "Fix bug #
3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
* commit '
f728411ba40d71a40a0cb0dbfcaa44764af17692':
Fix bug #
3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
Romain Guy [Wed, 26 Jan 2011 23:40:16 +0000 (15:40 -0800)]
Merge "Optimize invalidate() calls." into honeycomb
Fabrice Di Meglio [Wed, 26 Jan 2011 23:39:24 +0000 (15:39 -0800)]
Merge "Fix bug #
3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
Jason Chen [Wed, 26 Jan 2011 23:34:18 +0000 (15:34 -0800)]
am
b61440b4: Merge "Cherry-pick of
f5e4f208b9ed73 to honeycomb" into honeycomb
* commit '
b61440b440ab6cd89ea1462121302f0c4896a109':
Cherry-pick of
f5e4f208b9ed73 to honeycomb
Mike Lockwood [Wed, 26 Jan 2011 23:32:11 +0000 (15:32 -0800)]
am
a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
* commit '
a13732e17a0f3d69df9c418407985b3ad64b1852':
MTP: Fix month off by one error in date parsing and formatting code
Jason Chen [Wed, 26 Jan 2011 23:30:56 +0000 (15:30 -0800)]
Merge "Cherry-pick of
f5e4f208b9ed73 to honeycomb" into honeycomb
Mike Lockwood [Wed, 26 Jan 2011 23:30:07 +0000 (15:30 -0800)]
Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
Jeff Brown [Wed, 26 Jan 2011 23:03:32 +0000 (15:03 -0800)]
am
7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
* commit '
7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
Move keymaps from sdk/emulator/keymaps.
Shih-wei Liao [Wed, 26 Jan 2011 22:58:57 +0000 (14:58 -0800)]
am
79204b98: Merge "Part II of fixing b/
2943524: On-device linking rs_core." into honeycomb
* commit '
79204b98d260d8f5e8419f5149b31b336424aec5':
Part II of fixing b/
2943524: On-device linking rs_core.
Shih-wei Liao [Wed, 26 Jan 2011 22:56:41 +0000 (14:56 -0800)]
Merge "Part II of fixing b/
2943524: On-device linking rs_core." into honeycomb
John Wang [Wed, 26 Jan 2011 22:48:34 +0000 (14:48 -0800)]
am
7b4ba9d8: Merge "Enable recovery in RIL wakelock release check." into honeycomb
* commit '
7b4ba9d80d2cdde310c29d01d0e22c7815d84261':
Enable recovery in RIL wakelock release check.
James Dong [Wed, 26 Jan 2011 22:45:41 +0000 (14:45 -0800)]
am
7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
* commit '
7fb232c40cde91d0958be1694db2d97a126b95f9':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
John Wang [Wed, 26 Jan 2011 22:45:24 +0000 (14:45 -0800)]
Merge "Enable recovery in RIL wakelock release check." into honeycomb
James Dong [Wed, 26 Jan 2011 22:43:59 +0000 (14:43 -0800)]
Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
Svetoslav Ganov [Wed, 26 Jan 2011 22:41:33 +0000 (14:41 -0800)]
am
df467264: Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
* commit '
df4672643b92208b4ab7f9ab995dca8b69d3c458':
Final polish of WebView accessibility support for no JavaScript case.
Svetoslav Ganov [Wed, 26 Jan 2011 22:39:47 +0000 (14:39 -0800)]
Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
Jeff Brown [Wed, 26 Jan 2011 22:25:08 +0000 (14:25 -0800)]
Merge "Move keymaps from sdk/emulator/keymaps."
Dianne Hackborn [Wed, 26 Jan 2011 22:15:08 +0000 (14:15 -0800)]
am
ccd79399: am
1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '
ccd79399cc2a28d79287fd1558c5f5a530356003':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Jean-Michel Trivi [Wed, 26 Jan 2011 22:12:45 +0000 (14:12 -0800)]
am
1155efdc: (-s ours) am
2ba92c71: do not merge bug
3370834 Cherrypick from master
* commit '
1155efdc715413cd7a881e5226b5f5f0b2db8f71':
do not merge bug
3370834 Cherrypick from master
Stephen Hines [Wed, 26 Jan 2011 22:10:58 +0000 (14:10 -0800)]
am
8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
* commit '
8fc7690f2b42c27f9f609647b96c17234aa9d78e':
Hook up tgammaf properly for RS.
Stephen Hines [Wed, 26 Jan 2011 22:08:49 +0000 (14:08 -0800)]
Merge "Hook up tgammaf properly for RS." into honeycomb
Dianne Hackborn [Wed, 26 Jan 2011 22:08:30 +0000 (14:08 -0800)]
am
1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '
1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Jean-Michel Trivi [Wed, 26 Jan 2011 22:05:18 +0000 (14:05 -0800)]
am
2ba92c71: do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
Dianne Hackborn [Wed, 26 Jan 2011 21:59:42 +0000 (13:59 -0800)]
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
Romain Guy [Wed, 26 Jan 2011 21:42:53 +0000 (13:42 -0800)]
am
940df6dd: Merge "Remove unused API" into honeycomb
* commit '
940df6dd83624e5f46b147837d848853a1dab9b2':
Remove unused API
Romain Guy [Wed, 26 Jan 2011 21:41:10 +0000 (13:41 -0800)]
Merge "Remove unused API" into honeycomb
Gilles Debunne [Wed, 26 Jan 2011 21:35:28 +0000 (13:35 -0800)]
am
12b2dc23: Merge "Holo theme for error popups in TextViews." into honeycomb
* commit '
12b2dc23cc3cdd9dcd6bac91adc8e4198502bab5':
Holo theme for error popups in TextViews.
Gilles Debunne [Wed, 26 Jan 2011 21:33:24 +0000 (13:33 -0800)]
Merge "Holo theme for error popups in TextViews." into honeycomb
Adam Cohen [Wed, 26 Jan 2011 21:29:07 +0000 (13:29 -0800)]
am
10f27c5a: Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
* commit '
10f27c5a42e6da262d178d426944b2b31c185f4a':
Fixing bug where widgets would go dead after moving to another screen
Adam Cohen [Wed, 26 Jan 2011 21:26:58 +0000 (13:26 -0800)]
Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
Shimeng (Simon) Wang [Wed, 26 Jan 2011 21:25:50 +0000 (13:25 -0800)]
am
07837862: Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
* commit '
078378624c1955a1e842af34f79798918edccc21':
Fine tune the high memory threshold and usage delta for v8 GC.
Shimeng (Simon) Wang [Wed, 26 Jan 2011 21:23:58 +0000 (13:23 -0800)]
Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
Justin Ho [Wed, 26 Jan 2011 21:04:18 +0000 (13:04 -0800)]
am
8a445fc3: Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
* commit '
8a445fc30e45c1f7a9805ae19948ec32786458a0':
Integrating drawable-xlarge stat_sys assets
Justin Ho [Wed, 26 Jan 2011 21:02:01 +0000 (13:02 -0800)]
Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
Daniel Sandler [Wed, 26 Jan 2011 20:53:58 +0000 (12:53 -0800)]
am
044602b2: Merge "Ticker visual fixes." into honeycomb
* commit '
044602b226638e92907fbd573723772856256259':
Ticker visual fixes.
Daniel Sandler [Wed, 26 Jan 2011 20:51:30 +0000 (12:51 -0800)]
Merge "Ticker visual fixes." into honeycomb
Dharmaray Kundargi [Wed, 26 Jan 2011 20:48:32 +0000 (12:48 -0800)]
am
45e3d123: Merge "Overlay java files Issue
3370836" into honeycomb
* commit '
45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
Overlay java files Issue
3370836
Dharmaray Kundargi [Wed, 26 Jan 2011 20:48:28 +0000 (12:48 -0800)]
am
ecebf173: Merge "Fix for Issue
3370836 : JNI files for Overlay optmization." into honeycomb
* commit '
ecebf173deca568aa44f4fc29968e10c78ad7571':
Fix for Issue
3370836 : JNI files for Overlay optmization.
Dharmaray Kundargi [Wed, 26 Jan 2011 20:46:23 +0000 (12:46 -0800)]
Merge "Overlay java files Issue
3370836" into honeycomb
Dharmaray Kundargi [Wed, 26 Jan 2011 20:46:20 +0000 (12:46 -0800)]
Merge "Fix for Issue
3370836 : JNI files for Overlay optmization." into honeycomb
Mathias Agopian [Wed, 26 Jan 2011 20:43:16 +0000 (12:43 -0800)]
am
a0f40033: Merge "fix [
3385504] Surface flinger hang when adding dim surface" into honeycomb
* commit '
a0f40033c03a0b64538bf1c22f83d3c9a325ff87':
fix [
3385504] Surface flinger hang when adding dim surface
Mathias Agopian [Wed, 26 Jan 2011 20:41:02 +0000 (12:41 -0800)]
Merge "fix [
3385504] Surface flinger hang when adding dim surface" into honeycomb
Winson Chung [Wed, 26 Jan 2011 20:32:50 +0000 (12:32 -0800)]
am
2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (
3394210)" into honeycomb
* commit '
2c070bae4493cd1976c5086ec4cbf6ce10482742':
Re-enabling queued unbinding of services after requests to the service. (
3394210)
Winson Chung [Wed, 26 Jan 2011 20:30:26 +0000 (12:30 -0800)]
Merge "Re-enabling queued unbinding of services after requests to the service. (
3394210)" into honeycomb
Jaikumar Ganesh [Wed, 26 Jan 2011 20:25:29 +0000 (12:25 -0800)]
am
e9b644fc: Merge "Fix some unmatched javadoc tags." into honeycomb
* commit '
e9b644fcef08b0716efd3843ca7152e75cde3447':
Fix some unmatched javadoc tags.
Jaikumar Ganesh [Wed, 26 Jan 2011 20:23:15 +0000 (12:23 -0800)]
Merge "Fix some unmatched javadoc tags." into honeycomb
Andreas Huber [Wed, 26 Jan 2011 20:10:00 +0000 (12:10 -0800)]
am
373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
* commit '
373d357a8b13dc2cdc82d9e1d6144fb26e3bb202':
More instrumentation to track down the hardware decoder not shutting down bug.
Andreas Huber [Wed, 26 Jan 2011 20:09:56 +0000 (12:09 -0800)]
am
6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
* commit '
6df89fde0db446bb530ab872b373b1faa3ccb06c':
Ignore errors returned from native_window_set_crop.
Andreas Huber [Wed, 26 Jan 2011 20:08:09 +0000 (12:08 -0800)]
Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
Andreas Huber [Wed, 26 Jan 2011 20:06:39 +0000 (12:06 -0800)]
Merge "Ignore errors returned from native_window_set_crop." into honeycomb
Jason Sams [Wed, 26 Jan 2011 19:57:12 +0000 (11:57 -0800)]
am
e0fc4b70: Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
* commit '
e0fc4b70f812cef4c8850be91b008e75b28757f3':
DO NOT MERGE Remove the rs_quaternion functions until mr1
Jason Sams [Wed, 26 Jan 2011 19:57:08 +0000 (11:57 -0800)]
am
e361ca64: Merge "Migrating functions for on device linking." into honeycomb
* commit '
e361ca6428e137410ab828f5dee6148b8bdc29b3':
Migrating functions for on device linking.
Jason Sams [Wed, 26 Jan 2011 19:54:38 +0000 (11:54 -0800)]
Merge "DO NOT MERGE Remove the rs_quaternion functions until mr1" into honeycomb
Jason Sams [Wed, 26 Jan 2011 19:54:33 +0000 (11:54 -0800)]
Merge "Migrating functions for on device linking." into honeycomb
Joe Onorato [Wed, 26 Jan 2011 19:48:48 +0000 (11:48 -0800)]
am
1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
* commit '
1aadb2108d7614d9d1ff61b41c6c31cb8d211ab9':
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
Joe Onorato [Wed, 26 Jan 2011 19:46:58 +0000 (11:46 -0800)]
Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb
* changes:
Expose the window flags for lights out mode.
Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
Make FLAG_FULLSCREEN not go into lights out mode anymore.
Andreas Huber [Wed, 26 Jan 2011 19:44:17 +0000 (11:44 -0800)]
am
a9f27fa6: Merge "Protect notification callback parameters with a mutex." into honeycomb
* commit '
a9f27fa631ab21d52c75842ccaacc1cbcd75fca0':
Protect notification callback parameters with a mutex.
Andreas Huber [Wed, 26 Jan 2011 19:44:11 +0000 (11:44 -0800)]
am
7765c65d: Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
* commit '
7765c65dbe1ba8f2229f2fec5a83ba2d1da79733':
Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls.
Andreas Huber [Wed, 26 Jan 2011 19:43:50 +0000 (11:43 -0800)]
am
d030359f: Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
* commit '
d030359ff10a031c762d4f229d9c1bdfd366cb50':
Instead of not feeding the AudioTrack any data after EOS, play silence instead.
Andreas Huber [Wed, 26 Jan 2011 19:28:01 +0000 (11:28 -0800)]
Merge "Protect notification callback parameters with a mutex." into honeycomb
Andreas Huber [Wed, 26 Jan 2011 19:24:13 +0000 (11:24 -0800)]
Merge "Linux sockets suck, closing a socket descriptor does not abort pending recv/send calls." into honeycomb
Andreas Huber [Wed, 26 Jan 2011 19:11:50 +0000 (11:11 -0800)]
Merge "Instead of not feeding the AudioTrack any data after EOS, play silence instead." into honeycomb
Kenny Root [Wed, 26 Jan 2011 19:10:29 +0000 (11:10 -0800)]
resolved conflicts for merge of
2c1d0967 to honeycomb-plus-aosp
Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c
Kenny Root [Wed, 26 Jan 2011 19:01:14 +0000 (11:01 -0800)]
Merge "Make ObbActionListener a on-way call" into honeycomb
Romain Guy [Wed, 26 Jan 2011 18:56:08 +0000 (10:56 -0800)]
am
f5b27e35: Merge "Fix NPE in YouTube. Bug #
3385339" into honeycomb
* commit '
f5b27e35c1e0e46ffd882606d0783875e1a1ff7b':
Fix NPE in YouTube. Bug #
3385339
Romain Guy [Wed, 26 Jan 2011 18:54:23 +0000 (10:54 -0800)]
Merge "Fix NPE in YouTube. Bug #
3385339" into honeycomb
OSDN Git Service
