OSDN Git Service

android-x86/frameworks-native.git
12 years agoam 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searchin...
James Dong [Tue, 6 Dec 2011 20:55:39 +0000 (12:55 -0800)]
am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1

* commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames

12 years agoMerge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync...
James Dong [Tue, 6 Dec 2011 20:52:52 +0000 (12:52 -0800)]
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1

12 years agoam 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:46:46 +0000 (12:46 -0800)]
am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1

* commit '05d630691127c022befd071b2bede87c707112a9':
  DO NOT MERGE: Remove the AVI extractor.

12 years agoMerge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:44:53 +0000 (12:44 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1

12 years agoam 40cb30c2: am 7b62313e: Disable wifiwatchdog for now
Irfan Sheriff [Tue, 6 Dec 2011 19:37:40 +0000 (11:37 -0800)]
am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now

* commit '40cb30c2df2176c03f24cbdc194e3af5a4f64758':
  Disable wifiwatchdog for now

12 years agoam 7b62313e: Disable wifiwatchdog for now
Irfan Sheriff [Tue, 6 Dec 2011 19:34:58 +0000 (11:34 -0800)]
am 7b62313e: Disable wifiwatchdog for now

* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
  Disable wifiwatchdog for now

12 years agoam 98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1
Gilles Debunne [Tue, 6 Dec 2011 19:22:19 +0000 (11:22 -0800)]
am 98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1

* commit '98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
  Invalidated bounds tightened in TextView

12 years agoMerge "Invalidated bounds tightened in TextView" into ics-mr1
Gilles Debunne [Tue, 6 Dec 2011 19:20:18 +0000 (11:20 -0800)]
Merge "Invalidated bounds tightened in TextView" into ics-mr1

12 years agoam 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 6 Dec 2011 18:36:30 +0000 (10:36 -0800)]
am 58ad16cf: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 6 Dec 2011 18:34:41 +0000 (10:34 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoam ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessib...
Svetoslav Ganov [Tue, 6 Dec 2011 18:29:13 +0000 (10:29 -0800)]
am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1

* commit 'ea25ea7ef30be14dd940f1667e0308bfff5b4d85':
  Adding a system preference whether to speak passwords in accessibility mode.

12 years agoMerge "Adding a system preference whether to speak passwords in accessibility mode...
Svetoslav Ganov [Tue, 6 Dec 2011 18:27:04 +0000 (10:27 -0800)]
Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1

12 years agoam 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE...
Jeff Brown [Tue, 6 Dec 2011 06:52:20 +0000 (22:52 -0800)]
am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)" into ics-mr1

* commit '4079702ac27b51282a25de5f7c20f6fba6b71995':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)

12 years agoMerge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
Jeff Brown [Tue, 6 Dec 2011 06:50:49 +0000 (22:50 -0800)]
Merge "Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)" into ics-mr1

12 years agoam 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Status...
Jim Miller [Tue, 6 Dec 2011 06:14:37 +0000 (22:14 -0800)]
am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1

* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar

12 years agoMerge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into...
Jim Miller [Tue, 6 Dec 2011 06:12:54 +0000 (22:12 -0800)]
Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1

12 years agoam 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
Jesse Hall [Tue, 6 Dec 2011 05:24:53 +0000 (21:24 -0800)]
am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1

* commit '3e7b412d7d6332830ceaf123edb5e211757c69ce':
  Fix statusbar crash on devices with no Bluetooth

12 years agoMerge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
Jesse Hall [Tue, 6 Dec 2011 05:23:29 +0000 (21:23 -0800)]
Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1

12 years agoam 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch...
Matthew Xie [Tue, 6 Dec 2011 03:58:12 +0000 (19:58 -0800)]
am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1

* commit '0d9a41e74c81e8297ee439473c301a50da20cf0b':
  Broadcast turning on/off intent as early as possible when switch on/off BT

12 years agoMerge "Broadcast turning on/off intent as early as possible when switch on/off BT...
Matthew Xie [Tue, 6 Dec 2011 03:56:54 +0000 (19:56 -0800)]
Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1

12 years agoam 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents...
Dianne Hackborn [Tue, 6 Dec 2011 03:18:34 +0000 (19:18 -0800)]
am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1

* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
  Fix issue #5714517: App shortcuts can result in bad task intents

12 years agoMerge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1
Dianne Hackborn [Tue, 6 Dec 2011 03:16:54 +0000 (19:16 -0800)]
Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1

12 years agoam 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app on...
Dianne Hackborn [Tue, 6 Dec 2011 03:09:17 +0000 (19:09 -0800)]
am 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1

* commit '52245ac7c41735c561199d9ec7e9577d592ca852':
  Fix issue #5713576: Home redraws after returning from app on Nexus S 4G

12 years agoMerge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into...
Dianne Hackborn [Tue, 6 Dec 2011 03:07:52 +0000 (19:07 -0800)]
Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1

12 years agoam f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
Daniel Sandler [Tue, 6 Dec 2011 03:04:13 +0000 (19:04 -0800)]
am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1

* commit 'f66664a50e914e1cc5d66046cfc4c5b195a09eab':
  Fix sticky menu icon on tablet status bar.

12 years agoMerge "Fix sticky menu icon on tablet status bar." into ics-mr1
Daniel Sandler [Tue, 6 Dec 2011 03:02:28 +0000 (19:02 -0800)]
Merge "Fix sticky menu icon on tablet status bar." into ics-mr1

12 years agoam 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10...
Adam Powell [Tue, 6 Dec 2011 01:40:18 +0000 (17:40 -0800)]
am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1

* commit '9a856f4ee7b49f735e31b57a09bee2f033ce20a5':
  Drop API level for notification compatibility BG to 8 (from 10)

12 years agoMerge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
Adam Powell [Tue, 6 Dec 2011 01:38:23 +0000 (17:38 -0800)]
Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1

12 years agoam 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
Eric Laurent [Tue, 6 Dec 2011 01:22:58 +0000 (17:22 -0800)]
am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1

* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
  audioflinger: fix audio skipping over A2DP

12 years agoMerge "audioflinger: fix audio skipping over A2DP" into ics-mr1
Eric Laurent [Tue, 6 Dec 2011 01:20:53 +0000 (17:20 -0800)]
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1

12 years agoam b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only...
Fred Quintana [Tue, 6 Dec 2011 00:47:06 +0000 (16:47 -0800)]
am b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1

* commit 'b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
  By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()

12 years agoMerge "By default ICS allows two syncs to run in parallel. Make it only do one at...
Fred Quintana [Tue, 6 Dec 2011 00:45:29 +0000 (16:45 -0800)]
Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1

12 years agoam 3124e6f9: Merge "Remove debug log messages" into ics-mr1
Michael Kolb [Tue, 6 Dec 2011 00:13:49 +0000 (16:13 -0800)]
am 3124e6f9: Merge "Remove debug log messages" into ics-mr1

* commit '3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
  Remove debug log messages

12 years agoMerge "Remove debug log messages" into ics-mr1
Michael Kolb [Tue, 6 Dec 2011 00:12:35 +0000 (16:12 -0800)]
Merge "Remove debug log messages" into ics-mr1

12 years agoam e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
Xia Wang [Mon, 5 Dec 2011 23:55:27 +0000 (15:55 -0800)]
am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

* commit 'e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
  Add extra 2 minute for wifi to shutdown

12 years agoMerge "Add extra 2 minute for wifi to shutdown" into ics-mr1
Xia Wang [Mon, 5 Dec 2011 23:52:34 +0000 (15:52 -0800)]
Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

12 years agoam da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock...
Svetoslav Ganov [Mon, 5 Dec 2011 23:04:31 +0000 (15:04 -0800)]
am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1

* commit 'da926cf284ff5f5ccf91dec088ff64d442cee25c':
  TalkBack does not announce properly the buttons of the PIN lock.

12 years agoMerge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
Svetoslav Ganov [Mon, 5 Dec 2011 23:03:13 +0000 (15:03 -0800)]
Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1

12 years agoam 6b66e9e4: Switch to notifications for walled garden
Irfan Sheriff [Mon, 5 Dec 2011 22:22:03 +0000 (14:22 -0800)]
am 6b66e9e4: Switch to notifications for walled garden

* commit '6b66e9e4c95b1c866ea63a0122fc199994fd7053':
  Switch to notifications for walled garden

12 years agoam 74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
Peter Ng [Mon, 5 Dec 2011 20:36:24 +0000 (12:36 -0800)]
am 74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1

* commit '74b496dd8aab7e29bcba0c6502f773555c4ce29f':
  Numberpicker section divider is now 2dp thick

12 years agoMerge "Numberpicker section divider is now 2dp thick" into ics-mr1
Peter Ng [Mon, 5 Dec 2011 20:34:53 +0000 (12:34 -0800)]
Merge "Numberpicker section divider is now 2dp thick" into ics-mr1

12 years agoam 845b3efc: Merge "Add missing locale date format files." into ics-mr1
Eric Fischer [Mon, 5 Dec 2011 20:28:06 +0000 (12:28 -0800)]
am 845b3efc: Merge "Add missing locale date format files." into ics-mr1

* commit '845b3efc9935e66b718d8e9a56435bf039f97633':
  Add missing locale date format files.

12 years agoMerge "Add missing locale date format files." into ics-mr1
Eric Fischer [Mon, 5 Dec 2011 20:25:58 +0000 (12:25 -0800)]
Merge "Add missing locale date format files." into ics-mr1

12 years agoam f2e12498: Merge "Properly identify how much metadata we need to cache in order...
Andreas Huber [Mon, 5 Dec 2011 20:03:41 +0000 (12:03 -0800)]
am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1

* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59':
  Properly identify how much metadata we need to cache in order to instantiate

12 years agoMerge "Properly identify how much metadata we need to cache in order to instantiate...
Andreas Huber [Mon, 5 Dec 2011 20:01:26 +0000 (12:01 -0800)]
Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1

12 years agoam 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1
Dianne Hackborn [Mon, 5 Dec 2011 18:42:51 +0000 (10:42 -0800)]
am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1

* commit '003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
  Fix issue #5614559: Registering surface error in...

12 years agoMerge "Fix issue #5614559: Registering surface error in..." into ics-mr1
Dianne Hackborn [Mon, 5 Dec 2011 18:40:59 +0000 (10:40 -0800)]
Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1

12 years agoam 277cbe5a: Merge "set System UI visibility based on MediaController state" into...
Michael Kolb [Mon, 5 Dec 2011 17:26:21 +0000 (09:26 -0800)]
am 277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1

* commit '277cbe5a951840558166020568fb1510285e2594':
  set System UI visibility based on MediaController state

12 years agoMerge "set System UI visibility based on MediaController state" into ics-mr1
Michael Kolb [Mon, 5 Dec 2011 17:24:25 +0000 (09:24 -0800)]
Merge "set System UI visibility based on MediaController state" into ics-mr1

12 years agoam f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
Jesse Hall [Sat, 3 Dec 2011 02:33:14 +0000 (18:33 -0800)]
am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1

* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
  SurfaceFlinger: fix layer removal race condition

12 years agoMerge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
Jesse Hall [Sat, 3 Dec 2011 02:31:03 +0000 (18:31 -0800)]
Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1

12 years agoam 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
Robert Greenwalt [Sat, 3 Dec 2011 00:54:04 +0000 (16:54 -0800)]
am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1

* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
  Be careful sharing connections when dun is in play

12 years agoMerge "Be careful sharing connections when dun is in play" into ics-mr1
Robert Greenwalt [Sat, 3 Dec 2011 00:52:29 +0000 (16:52 -0800)]
Merge "Be careful sharing connections when dun is in play" into ics-mr1

12 years agoam 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into...
Gilles Debunne [Fri, 2 Dec 2011 23:31:07 +0000 (15:31 -0800)]
am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1

* commit '2f1e1e4ab9ca20920d85574317c9d7c9e9e73161':
  Handle animations in Views' rectangle clipping methods.

12 years agoMerge "Handle animations in Views' rectangle clipping methods." into ics-mr1
Gilles Debunne [Fri, 2 Dec 2011 23:28:56 +0000 (15:28 -0800)]
Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1

12 years agoam 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
John Reck [Fri, 2 Dec 2011 22:49:19 +0000 (14:49 -0800)]
am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1

* commit '43bc6b094edda6baa8123115a33afaf454525376':
  Fix updateDoubleTapZoom logic

12 years agoMerge "Fix updateDoubleTapZoom logic" into ics-mr1
John Reck [Fri, 2 Dec 2011 22:47:04 +0000 (14:47 -0800)]
Merge "Fix updateDoubleTapZoom logic" into ics-mr1

12 years agoam 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectori...
Mike Lockwood [Fri, 2 Dec 2011 21:22:17 +0000 (13:22 -0800)]
am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1

* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE

12 years agoam 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the...
Mike Lockwood [Fri, 2 Dec 2011 21:22:15 +0000 (13:22 -0800)]
am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1

* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
  MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE

12 years agoMerge "MTP: Add support for restricting PTP to only certain subdirectories of the...
Mike Lockwood [Fri, 2 Dec 2011 21:20:49 +0000 (13:20 -0800)]
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1

12 years agoMerge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO...
Mike Lockwood [Fri, 2 Dec 2011 21:20:39 +0000 (13:20 -0800)]
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1

12 years agoam 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Stagin...
Chia-chi Yeh [Fri, 2 Dec 2011 20:48:35 +0000 (12:48 -0800)]
am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0

* commit '25bcbbb5971e2832c3020ee406b27d641d4ca05b':
  Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html

12 years agoam 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server...
Chia-chi Yeh [Fri, 2 Dec 2011 20:46:51 +0000 (12:46 -0800)]
am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0

* commit '431c3e4c7e2103865a90501a552b4e5145ed3f35':
  Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html

12 years agoMerge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung...
Chia-chi Yeh [Fri, 2 Dec 2011 20:45:44 +0000 (12:45 -0800)]
Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0

12 years agoam 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
Jesse Hall [Fri, 2 Dec 2011 20:35:22 +0000 (12:35 -0800)]
am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1

* commit '6d90c1c6fedc7add177418324ba5e591af543fa4':
  Disable GLES20Canvas on emu w/o native GL

12 years agoMerge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
Jesse Hall [Fri, 2 Dec 2011 20:33:20 +0000 (12:33 -0800)]
Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1

12 years agoam 55347e65: am cd0e446d: Merge "Reduce file size for ADL presentation shareable...
Roman Nurik [Fri, 2 Dec 2011 20:01:36 +0000 (12:01 -0800)]
am 55347e65: am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0

* commit '55347e65e229ed63f7e18cb5b82639174c0f54bb':
  Reduce file size for ADL presentation shareable.

12 years agoam cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
Roman Nurik [Fri, 2 Dec 2011 19:59:07 +0000 (11:59 -0800)]
am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0

* commit 'cd0e446dc8de4b639df889ec3b5754bea60d752a':
  Reduce file size for ADL presentation shareable.

12 years agoMerge "Reduce file size for ADL presentation shareable." into ics-mr0
Roman Nurik [Fri, 2 Dec 2011 19:57:03 +0000 (11:57 -0800)]
Merge "Reduce file size for ADL presentation shareable." into ics-mr0

12 years agoam afd01086: Merge "Further volume improvements." into ics-mr1
Amith Yamasani [Fri, 2 Dec 2011 19:24:03 +0000 (11:24 -0800)]
am afd01086: Merge "Further volume improvements." into ics-mr1

* commit 'afd01086795c7c1f6950a709180b2361625b8b6a':
  Further volume improvements.

12 years agoMerge "Further volume improvements." into ics-mr1
Amith Yamasani [Fri, 2 Dec 2011 19:22:32 +0000 (11:22 -0800)]
Merge "Further volume improvements." into ics-mr1

12 years agoam f96aa3b1: Merge "(de)activating spell check taken into account immediately" into...
Gilles Debunne [Fri, 2 Dec 2011 18:47:46 +0000 (10:47 -0800)]
am f96aa3b1: Merge "(de)activating spell check taken into account immediately" into ics-mr1

* commit 'f96aa3b197b96f9cb276485420c09a7b36606599':
  (de)activating spell check taken into account immediately

12 years agoMerge "(de)activating spell check taken into account immediately" into ics-mr1
Gilles Debunne [Fri, 2 Dec 2011 18:45:25 +0000 (10:45 -0800)]
Merge "(de)activating spell check taken into account immediately" into ics-mr1

12 years agoSurfaceFlinger: fix layer removal race condition
Jesse Hall [Fri, 2 Dec 2011 18:00:00 +0000 (10:00 -0800)]
SurfaceFlinger: fix layer removal race condition

Layer::lockPageFlip() and layer::onRemove() could be called on
different threads and race such that lockPageFlip() successfully
called mSurfaceTexture->updateTexImage() but then gets NULL back from
mSurfaceTexture->getCurrentBuffer(), leading to a crash.

This change moves Layer::onRemove() calls to
SurfaceFlinger::commitTransaction() so they happen after the Layer is
done being drawn from and only happen on the main surfaceflinger
thread.

Change-Id: I4b550caadff4cc1878d7c3bca6129193fb0c713e

12 years agoam 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new...
Hong Teng [Fri, 2 Dec 2011 17:34:05 +0000 (09:34 -0800)]
am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the applicati

* commit '613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0':
  Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.

12 years agoMerge "Fixd for 5490443 Native crash while exporting a video - Add new onError callba...
Hong Teng [Fri, 2 Dec 2011 17:32:02 +0000 (09:32 -0800)]
Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly." into ics-mr1

12 years agoam e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver...
Ben Cheng [Fri, 2 Dec 2011 06:06:32 +0000 (22:06 -0800)]
am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1

* commit 'e21dabf654e3d90e50e95174d5e9670bc930c194':
  Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.

12 years agoMerge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
Ben Cheng [Fri, 2 Dec 2011 06:05:07 +0000 (22:05 -0800)]
Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1

12 years agoam 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1
Eric Laurent [Fri, 2 Dec 2011 04:35:26 +0000 (20:35 -0800)]
am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1

* commit '0d3a2e93394efa4729e5c29ff4515f9f2644b8c3':
  AudioService: strengthen A2DP device detection

12 years agoMerge "AudioService: strengthen A2DP device detection" into ics-mr1
Eric Laurent [Fri, 2 Dec 2011 04:34:08 +0000 (20:34 -0800)]
Merge "AudioService: strengthen A2DP device detection" into ics-mr1

12 years agoam bfb3dec2: Merge "More social integration." into ics-mr1
Dianne Hackborn [Fri, 2 Dec 2011 02:50:36 +0000 (18:50 -0800)]
am bfb3dec2: Merge "More social integration." into ics-mr1

* commit 'bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10':
  More social integration.

12 years agoMerge "More social integration." into ics-mr1
Dianne Hackborn [Fri, 2 Dec 2011 02:48:32 +0000 (18:48 -0800)]
Merge "More social integration." into ics-mr1

12 years agoam 976ae272: Add support for handling a bitcode wrapper to librs.
Stephen Hines [Fri, 2 Dec 2011 02:10:29 +0000 (18:10 -0800)]
am 976ae272: Add support for handling a bitcode wrapper to librs.

* commit '976ae27270a64c5abeb380d6e61d6d71f29b9433':
  Add support for handling a bitcode wrapper to librs.

12 years agoInitialize bwr.read_buffer in IPCThreadState::talkWithDriver.
Ben Cheng [Fri, 2 Dec 2011 01:11:32 +0000 (17:11 -0800)]
Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.

I/valgrind( 1309): ==1310== Syscall param
ioctl(BINDER_WRITE_READ).read_buffer points to uninitialised byte(s)
I/valgrind( 1309): ==1310==    at 0x480E670: __ioctl (__ioctl.S:10)
I/valgrind( 1309): ==1310==  Address 0xbda651b4 is on thread 1's stack

Change-Id: I02893df7b5786b6b2dbd9659f5706d7171295ab2

12 years agoam 335c4e6c: Broken build. New methods made private.
Gilles Debunne [Fri, 2 Dec 2011 00:06:51 +0000 (16:06 -0800)]
am 335c4e6c: Broken build. New methods made private.

* commit '335c4e6cb2094c7cbd6039e0c7915702b69e7657':
  Broken build. New methods made private.

12 years agoam 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:07:10 +0000 (15:07 -0800)]
am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1

* commit '58d8953958ce452c5080eaa582d7e5d2b5017398':
  Scroll performance improved in multiline TextEdit

12 years agoam eb189d39: Merge "Performance improvement in TextView" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:07:08 +0000 (15:07 -0800)]
am eb189d39: Merge "Performance improvement in TextView" into ics-mr1

* commit 'eb189d399a459c2e1ad29e1beba70d1de9f447b3':
  Performance improvement in TextView

12 years agoam 09cbff02: Merge "Better handles\' visibility test" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:04:46 +0000 (15:04 -0800)]
am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1

* commit '09cbff0294a27d33c93de50e0b4471ad86154a84':
  Better handles' visibility test

12 years agoMerge "Scroll performance improved in multiline TextEdit" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:04:35 +0000 (15:04 -0800)]
Merge "Scroll performance improved in multiline TextEdit" into ics-mr1

12 years agoMerge "Performance improvement in TextView" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:03:55 +0000 (15:03 -0800)]
Merge "Performance improvement in TextView" into ics-mr1

12 years agoMerge "Better handles' visibility test" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:03:27 +0000 (15:03 -0800)]
Merge "Better handles' visibility test" into ics-mr1

12 years agoam cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into...
Winson Chung [Thu, 1 Dec 2011 22:57:50 +0000 (14:57 -0800)]
am cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1

* commit 'cea32ecd3aef013bc5da6e401eeb8e9e8cd1b595':
  Adding a sound when you take a screenshot. (Bug 5617734)

12 years agoMerge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1
Winson Chung [Thu, 1 Dec 2011 22:55:41 +0000 (14:55 -0800)]
Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1

12 years agoam 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1
Kenny Root [Thu, 1 Dec 2011 22:16:18 +0000 (14:16 -0800)]
am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1

* commit '5a7c91769f011bc150c9def9edab9cccb4761c66':
  Fix free_cache to actually work

12 years agoMerge "Fix free_cache to actually work" into ics-mr1
Kenny Root [Thu, 1 Dec 2011 22:14:22 +0000 (14:14 -0800)]
Merge "Fix free_cache to actually work" into ics-mr1

12 years agoam a7d825dd: am c3998ced: Merge "Update widget design guidelines for padding and...
Roman Nurik [Thu, 1 Dec 2011 21:44:41 +0000 (13:44 -0800)]
am a7d825dd: am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0

* commit 'a7d825dddcb2e8bfd765bad2fb406498f4f1e37e':
  Update widget design guidelines for padding and 8dp.

12 years agoam c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
Roman Nurik [Thu, 1 Dec 2011 21:42:23 +0000 (13:42 -0800)]
am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0

* commit 'c3998ced746ee97bc5f10a9de1b2848f85c8711e':
  Update widget design guidelines for padding and 8dp.

12 years agoMerge "Update widget design guidelines for padding and 8dp." into ics-mr0
Roman Nurik [Thu, 1 Dec 2011 21:40:38 +0000 (13:40 -0800)]
Merge "Update widget design guidelines for padding and 8dp." into ics-mr0

12 years agoam 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth servic...
Matthew Xie [Thu, 1 Dec 2011 21:34:18 +0000 (13:34 -0800)]
am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1

* commit '1a1be44c5bf1e6099d678c81ef5e9326cabcb3df':
  Unlink the Binder DeathRecipient when removing a Bluetooth service record

12 years agoMerge "Unlink the Binder DeathRecipient when removing a Bluetooth service record...
Matthew Xie [Thu, 1 Dec 2011 21:32:19 +0000 (13:32 -0800)]
Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1