OSDN Git Service

android-x86/frameworks-native.git
12 years agoam 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuitie...
Andreas Huber [Tue, 29 Nov 2011 22:12:18 +0000 (14:12 -0800)]
am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1

* commit '351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
  Updated (internal) API for IStreamSource to signal discontinuities

12 years agoam 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:10:09 +0000 (14:10 -0800)]
am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1

* commit '405a4e34032f8a07028138266fe9f79f6753b466':
  Finer granularity discontinuity support.

12 years agoMerge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1

12 years agoMerge "Finer granularity discontinuity support." into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:13 +0000 (14:08 -0800)]
Merge "Finer granularity discontinuity support." into ics-mr1

12 years agoam be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
Jeff Brown [Tue, 29 Nov 2011 21:15:51 +0000 (13:15 -0800)]
am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1

* commit 'be6ab576ff0e3bf2a8dc3feee6f476061afbda30':
  Fix application launch shortcuts.

12 years agoMerge "Fix application launch shortcuts." into ics-mr1
Jeff Brown [Tue, 29 Nov 2011 21:13:33 +0000 (13:13 -0800)]
Merge "Fix application launch shortcuts." into ics-mr1

12 years agoam 50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
Dianne Hackborn [Tue, 29 Nov 2011 21:09:03 +0000 (13:09 -0800)]
am 50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1

* commit '50b2042502bc459b40430fe3b3b83d7d61e5daf9':
  Another attempt at getting OOM reports to batch.

12 years agoMerge "Another attempt at getting OOM reports to batch." into ics-mr1
Dianne Hackborn [Tue, 29 Nov 2011 21:05:26 +0000 (13:05 -0800)]
Merge "Another attempt at getting OOM reports to batch." into ics-mr1

12 years agoFix application launch shortcuts.
Jeff Brown [Mon, 28 Nov 2011 20:59:11 +0000 (12:59 -0800)]
Fix application launch shortcuts.

Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.

Added a set of Intent categories for typical applications on the
platform.

Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys.  Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos.  The goal is to encourage them
to stop doing this by implementing more of HID.

Bug: 5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593

12 years agoam 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 29 Nov 2011 19:47:08 +0000 (11:47 -0800)]
am 9ab3c624: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '9ab3c62499c054b600699fb107c28fc8926ca5a1':
  Import revised translations.  DO NOT MERGE

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 29 Nov 2011 19:44:59 +0000 (11:44 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoam 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
Mathias Agopian [Tue, 29 Nov 2011 19:36:54 +0000 (11:36 -0800)]
am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1

* commit '3f2730c5317700e3ae5412b5c825a747b591ebc2':
  temporarily hardcode Nexus S refresh rate

12 years agoMerge "temporarily hardcode Nexus S refresh rate" into ics-mr1
Mathias Agopian [Tue, 29 Nov 2011 19:35:07 +0000 (11:35 -0800)]
Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1

12 years agoam 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen...
Dianne Hackborn [Tue, 29 Nov 2011 18:17:42 +0000 (10:17 -0800)]
am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1

* commit '9b518d9304eb4ad17591944926231b661a3dfce0':
  Fix issue #5642121: Proximity sensor didn't turn the screen on in call

12 years agoMerge "Fix issue #5642121: Proximity sensor didn't turn the screen on in call" into...
Dianne Hackborn [Tue, 29 Nov 2011 18:16:11 +0000 (10:16 -0800)]
Merge "Fix issue #5642121: Proximity sensor didn't turn the screen on in call" into ics-mr1

12 years agoam eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
Jaikumar Ganesh [Tue, 29 Nov 2011 18:07:09 +0000 (10:07 -0800)]
am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1

* commit 'eb701df88cb3027d6323f9e2607cbe4d5ca93ac2':
  Cleanup references when turning BT off.

12 years agoam ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
Jaikumar Ganesh [Tue, 29 Nov 2011 18:07:07 +0000 (10:07 -0800)]
am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1

* commit 'ff33b94e236fcde3833fba698d32d0e6b98fa303':
  Cleanup static references when quitting.

12 years agoMerge "Cleanup references when turning BT off." into ics-mr1
Jaikumar Ganesh [Tue, 29 Nov 2011 18:05:27 +0000 (10:05 -0800)]
Merge "Cleanup references when turning BT off." into ics-mr1

12 years agoMerge "Cleanup static references when quitting." into ics-mr1
Jaikumar Ganesh [Tue, 29 Nov 2011 18:05:13 +0000 (10:05 -0800)]
Merge "Cleanup static references when quitting." into ics-mr1

12 years agoam 10232fe6: Merge "Extracted text problems" into ics-mr1
Gilles Debunne [Tue, 29 Nov 2011 18:01:35 +0000 (10:01 -0800)]
am 10232fe6: Merge "Extracted text problems" into ics-mr1

* commit '10232fe63916d03d147d0a07f8bf4d70cb60941c':
  Extracted text problems

12 years agoam 7be31bd9: Merge "IOOB in text selection." into ics-mr1
Gilles Debunne [Tue, 29 Nov 2011 17:59:25 +0000 (09:59 -0800)]
am 7be31bd9: Merge "IOOB in text selection." into ics-mr1

* commit '7be31bd96a4cc71ebc2539573f062fa53cc7cb05':
  IOOB in text selection.

12 years agoMerge "Extracted text problems" into ics-mr1
Gilles Debunne [Tue, 29 Nov 2011 17:59:00 +0000 (09:59 -0800)]
Merge "Extracted text problems" into ics-mr1

12 years agoMerge "IOOB in text selection." into ics-mr1
Gilles Debunne [Tue, 29 Nov 2011 17:56:58 +0000 (09:56 -0800)]
Merge "IOOB in text selection." into ics-mr1

12 years agoam fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
Daniel Sandler [Tue, 29 Nov 2011 13:51:18 +0000 (05:51 -0800)]
am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

* commit 'fed7a99a5294856d930e18225898828bd6755be1':
  Quick fix for bug 5646217 blocking automation tests

12 years agoMerge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
Daniel Sandler [Tue, 29 Nov 2011 13:49:11 +0000 (05:49 -0800)]
Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

12 years agoam 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder...
Yu Shan Emily Lau [Tue, 29 Nov 2011 03:55:27 +0000 (19:55 -0800)]
am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

* commit '4e5d3f2ca05b513640d3163155756e01ae577d54':
  Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.

12 years agoMerge "Add the min fps option to set the min fps in the media recorder test. Add...
Yu Shan Emily Lau [Tue, 29 Nov 2011 03:53:58 +0000 (19:53 -0800)]
Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

12 years agoam 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
Christopher Tate [Tue, 29 Nov 2011 01:58:25 +0000 (17:58 -0800)]
am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1

* commit '051606150a80efa71b139e9d52fe6c8b2c02c884':
  Add iteration-limited mode to FrameworkPerf

12 years agoMerge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
Christopher Tate [Tue, 29 Nov 2011 01:56:18 +0000 (17:56 -0800)]
Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1

12 years agoam e5715521: am 2d9f4620: Fix build
Xia Wang [Tue, 29 Nov 2011 00:57:14 +0000 (16:57 -0800)]
am e5715521: am 2d9f4620: Fix build

* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
  Fix build

12 years agoam b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from...
Dianne Hackborn [Tue, 29 Nov 2011 00:55:05 +0000 (16:55 -0800)]
am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

* commit 'b54980d1d4d903f68cdfa952256afff01902cd94':
  Fix issue #5588689: Black camera preview after coming back from gmail

12 years agoam 2d9f4620: Fix build
Xia Wang [Tue, 29 Nov 2011 00:53:50 +0000 (16:53 -0800)]
am 2d9f4620: Fix build

* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
  Fix build

12 years agoMerge "Fix issue #5588689: Black camera preview after coming back from gmail" into...
Dianne Hackborn [Tue, 29 Nov 2011 00:53:00 +0000 (16:53 -0800)]
Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

12 years agoam 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1
Romain Guy [Tue, 29 Nov 2011 00:08:52 +0000 (16:08 -0800)]
am 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1

* commit '46685db957cc01cef4ba198aafe44d99fe31f62c':
  Fix crash in existing applications Bug #5659476

12 years agoMerge "Fix crash in existing applications Bug #5659476" into ics-mr1
Romain Guy [Tue, 29 Nov 2011 00:06:52 +0000 (16:06 -0800)]
Merge "Fix crash in existing applications Bug #5659476" into ics-mr1

12 years agoam da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start:...
Xia Wang [Tue, 29 Nov 2011 00:04:39 +0000 (16:04 -0800)]
am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

* commit 'da822367886d68f997153c7edd5368f3dfb6d58d':
  Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901

12 years agoam 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes...
Xia Wang [Tue, 29 Nov 2011 00:02:44 +0000 (16:02 -0800)]
am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

* commit '25261f59af0d902f239e541b735f7dc31e714b07':
  Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901

12 years agoMerge "Increase time between wifi stop and wifi start: set to 2 minutes http://b...
Xia Wang [Tue, 29 Nov 2011 00:00:49 +0000 (16:00 -0800)]
Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

12 years agoam 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape....
Chet Haase [Mon, 28 Nov 2011 23:45:32 +0000 (15:45 -0800)]
am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1

* commit '8990cb5768efba46bb1d7458377dd44498afcfdb':
  Fix flashing wifi dialog after rotating back from landscape.

12 years agoMerge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
Chet Haase [Mon, 28 Nov 2011 23:43:23 +0000 (15:43 -0800)]
Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1

12 years agoam 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
Eric Rowe [Mon, 28 Nov 2011 22:26:39 +0000 (14:26 -0800)]
am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1

* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
  Fix SCO start stop tests.

12 years agoMerge "Fix SCO start stop tests." into ics-mr1
Eric Rowe [Mon, 28 Nov 2011 20:32:34 +0000 (12:32 -0800)]
Merge "Fix SCO start stop tests." into ics-mr1

12 years agoam a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into...
Narayan Kamath [Mon, 28 Nov 2011 18:39:07 +0000 (10:39 -0800)]
am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1

* commit 'a6f8ebc616cfe3185ae2513ef2f846e8d32b551e':
  Fix TTS instantiation from webview accessibility handlers.

12 years agoMerge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
Narayan Kamath [Mon, 28 Nov 2011 18:36:32 +0000 (10:36 -0800)]
Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1

12 years agoam 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into...
Derek Sollenberger [Mon, 28 Nov 2011 18:35:57 +0000 (10:35 -0800)]
am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1

* commit '425c595acb798ed9652b5a1f0e5412cbd8e3873d':
  Update Webkit with the zoom level after double tap gesture

12 years agoMerge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
Derek Sollenberger [Mon, 28 Nov 2011 18:34:04 +0000 (10:34 -0800)]
Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1

12 years agoam 2ffc9ec3: Ensure we dismiss the <select> option dialog.
Ben Murdoch [Mon, 28 Nov 2011 18:33:48 +0000 (10:33 -0800)]
am 2ffc9ec3: Ensure we dismiss the <select> option dialog.

* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
  Ensure we dismiss the <select> option dialog.

12 years agoam e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
Narayan Kamath [Thu, 24 Nov 2011 17:40:04 +0000 (09:40 -0800)]
am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1

* commit 'e35581ad5ad635f9dcfe4ab6a432c48b46b782cd':
  Fix regressions in TTS completion callbacks.

12 years agoMerge "Fix regressions in TTS completion callbacks." into ics-mr1
Narayan Kamath [Thu, 24 Nov 2011 17:38:15 +0000 (09:38 -0800)]
Merge "Fix regressions in TTS completion callbacks." into ics-mr1

12 years agoam 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
Irfan Sheriff [Thu, 24 Nov 2011 03:19:56 +0000 (19:19 -0800)]
am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1

* commit '7b6d238b7515fdd070c361a03e99e6022f2cd2ba':
  Fix tethering interaction from wifi

12 years agoMerge "Fix tethering interaction from wifi" into ics-mr1
Irfan Sheriff [Thu, 24 Nov 2011 03:18:22 +0000 (19:18 -0800)]
Merge "Fix tethering interaction from wifi" into ics-mr1

12 years agoam e95f4986: Merge "Fix a build break." into ics-mr1
John Wang [Thu, 24 Nov 2011 00:50:04 +0000 (16:50 -0800)]
am e95f4986: Merge "Fix a build break." into ics-mr1

* commit 'e95f49869b02dd9792718fb1075241acdf6ca775':
  Fix a build break.

12 years agoMerge "Fix a build break." into ics-mr1
John Wang [Thu, 24 Nov 2011 00:48:32 +0000 (16:48 -0800)]
Merge "Fix a build break." into ics-mr1

12 years agoam 8ce22f26: Fixing a typo in framework widget padding
Adam Cohen [Thu, 24 Nov 2011 00:41:01 +0000 (16:41 -0800)]
am 8ce22f26: Fixing a typo in framework widget padding

* commit '8ce22f2644acb51bfe0b9d600f1d2ad64e80513c':
  Fixing a typo in framework widget padding

12 years agoam 9b108009: Check watingApns before access it.
John Wang [Wed, 23 Nov 2011 23:37:20 +0000 (15:37 -0800)]
am 9b108009: Check watingApns before access it.

* commit '9b1080091c4ac97378db366cdd6961aba28756c5':
  Check watingApns before access it.

12 years agotemporarily hardcode Nexus S refresh rate
Mathias Agopian [Wed, 23 Nov 2011 22:51:09 +0000 (14:51 -0800)]
temporarily hardcode Nexus S refresh rate

Change-Id: Id8465f679b96636041b4b891d0b358c387d456c3

12 years agoam 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
Eric Laurent [Wed, 23 Nov 2011 20:32:53 +0000 (12:32 -0800)]
am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1

* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
  audioflinger: reduce sleep time to avoid underrun

12 years agoMerge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
Eric Laurent [Wed, 23 Nov 2011 20:31:04 +0000 (12:31 -0800)]
Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1

12 years agoam 37ac88f9: Merge "Update description of account_type" into ics-mr1
Michael Chan [Wed, 23 Nov 2011 20:14:16 +0000 (12:14 -0800)]
am 37ac88f9: Merge "Update description of account_type" into ics-mr1

* commit '37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
  Update description of account_type

12 years agoMerge "Update description of account_type" into ics-mr1
Michael Chan [Wed, 23 Nov 2011 20:12:51 +0000 (12:12 -0800)]
Merge "Update description of account_type" into ics-mr1

12 years agoam eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
Robert Greenwalt [Wed, 23 Nov 2011 19:27:06 +0000 (11:27 -0800)]
am eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1

* commit 'eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
  Fix some policy-base routing issues.

12 years agoMerge "Fix some policy-base routing issues." into ics-mr1
Robert Greenwalt [Wed, 23 Nov 2011 19:25:39 +0000 (11:25 -0800)]
Merge "Fix some policy-base routing issues." into ics-mr1

12 years agoam 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange...
Owen Lin [Wed, 23 Nov 2011 01:46:35 +0000 (17:46 -0800)]
am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1

* commit '8bb56180d208b9264e5a56b49fe06b8471ccaced':
  Fix 5654631. It forgot to consider the year in formatDateRange.

12 years agoMerge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1
Owen Lin [Wed, 23 Nov 2011 01:44:52 +0000 (17:44 -0800)]
Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1

12 years agoam 1889bb49: Reconcile with ics-mr0-release
The Android Open Source Project [Tue, 22 Nov 2011 23:26:16 +0000 (15:26 -0800)]
am 1889bb49: Reconcile with ics-mr0-release

* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 22 Nov 2011 23:24:03 +0000 (15:24 -0800)]
Reconcile with ics-mr0-release

Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864

12 years agoam 27239099: Reconcile with ics-mr0-release
The Android Open Source Project [Tue, 22 Nov 2011 23:16:08 +0000 (15:16 -0800)]
am 27239099: Reconcile with ics-mr0-release

* commit '2723909903b68db016666a13ec897581a8915636':

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 22 Nov 2011 23:14:10 +0000 (15:14 -0800)]
Reconcile with ics-mr0-release

Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 22 Nov 2011 22:28:06 +0000 (14:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam eabde3d4: am fe464a76: [Prime K] Fix gabage character issue
dujin.cha [Tue, 22 Nov 2011 21:20:09 +0000 (13:20 -0800)]
am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue

* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue

12 years agoam fe464a76: [Prime K] Fix gabage character issue
dujin.cha [Tue, 22 Nov 2011 21:18:27 +0000 (13:18 -0800)]
am fe464a76: [Prime K] Fix gabage character issue

* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
  [Prime K] Fix gabage character issue

12 years agoam eff6ed0f: Ignore e36657e5
Jean-Baptiste Queru [Tue, 22 Nov 2011 21:18:05 +0000 (13:18 -0800)]
am eff6ed0f: Ignore e36657e5

* commit 'eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f':
  Do not merge. Fix a memory leak of a Binder in SpellCheckerService

12 years agoIgnore e36657e5
Jean-Baptiste Queru [Tue, 22 Nov 2011 21:15:28 +0000 (13:15 -0800)]
Ignore e36657e5

Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada

12 years agoam 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514...
Romain Guy [Tue, 22 Nov 2011 20:35:25 +0000 (12:35 -0800)]
am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1

* commit '303a0695b8fa0b8f0095c437145a28633a7a8d92':
  Draw in the correct FBO after invoking a GL functor Bug #5650514

12 years agoam 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421...
Romain Guy [Tue, 22 Nov 2011 20:35:18 +0000 (12:35 -0800)]
am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1

* commit '26dd54f87c1daaa369576d9abea823c8105bd702':
  Ensure we have an EGL context when building layers Bug #5638421

12 years agoMerge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1
Romain Guy [Tue, 22 Nov 2011 20:33:17 +0000 (12:33 -0800)]
Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1

12 years agoMerge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1
Romain Guy [Tue, 22 Nov 2011 20:33:04 +0000 (12:33 -0800)]
Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1

12 years agoam 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
Amith Yamasani [Tue, 22 Nov 2011 19:04:58 +0000 (11:04 -0800)]
am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1

* commit '227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
  Fix an NPE on overflow in BatteryStats history.

12 years agoMerge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
Amith Yamasani [Tue, 22 Nov 2011 19:02:49 +0000 (11:02 -0800)]
Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1

12 years agoam 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
Teng-Hui Zhu [Tue, 22 Nov 2011 16:57:02 +0000 (08:57 -0800)]
am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1

* commit '7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
  HTML5 Video runs into super full screen mode

12 years agoMerge "HTML5 Video runs into super full screen mode" into ics-mr1
Teng-Hui Zhu [Tue, 22 Nov 2011 16:54:59 +0000 (08:54 -0800)]
Merge "HTML5 Video runs into super full screen mode" into ics-mr1

12 years agoam cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc...
Andreas Huber [Tue, 22 Nov 2011 16:41:04 +0000 (08:41 -0800)]
am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1

* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
  Report a runtime error instead of asserting on malformed avc configuration data.

12 years agoMerge "Report a runtime error instead of asserting on malformed avc configuration...
Andreas Huber [Tue, 22 Nov 2011 16:39:11 +0000 (08:39 -0800)]
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1

12 years agoam 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
Daniel Sandler [Tue, 22 Nov 2011 15:16:47 +0000 (07:16 -0800)]
am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1

* commit '631885746868cbf03f89e655a6f4fac96449e8a4':
  Dismiss system windows when screen savers start.

12 years agoMerge "Dismiss system windows when screen savers start." into ics-mr1
Daniel Sandler [Tue, 22 Nov 2011 15:15:29 +0000 (07:15 -0800)]
Merge "Dismiss system windows when screen savers start." into ics-mr1

12 years agoam 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into...
Mangesh Ghiware [Tue, 22 Nov 2011 07:16:06 +0000 (23:16 -0800)]
am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1

* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
  Update zoom (aka display) density from WebView thread.

12 years agoMerge "Update zoom (aka display) density from WebView thread." into ics-mr1
Mangesh Ghiware [Tue, 22 Nov 2011 07:14:05 +0000 (23:14 -0800)]
Merge "Update zoom (aka display) density from WebView thread." into ics-mr1

12 years agoam 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct...
Romain Guy [Tue, 22 Nov 2011 05:20:57 +0000 (21:20 -0800)]
am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1

* commit '723218b4f428944bdb11b25d0b30ece56283f696':
  Hide ManagedEGLContext until we are sure this is the correct API.

12 years agoMerge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
Romain Guy [Tue, 22 Nov 2011 05:18:51 +0000 (21:18 -0800)]
Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1

12 years agoam 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
James Dong [Tue, 22 Nov 2011 04:29:59 +0000 (20:29 -0800)]
am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1

* commit '02740dc49df86fc94c872454aa9db98737d5e8c8':
  Fix log spamming during time lapse video recording

12 years agoMerge "Fix log spamming during time lapse video recording" into ics-mr1
James Dong [Tue, 22 Nov 2011 04:28:27 +0000 (20:28 -0800)]
Merge "Fix log spamming during time lapse video recording" into ics-mr1

12 years agoam 1766b0e2: Fix the build
Romain Guy [Tue, 22 Nov 2011 02:31:29 +0000 (18:31 -0800)]
am 1766b0e2: Fix the build

* commit '1766b0e25de5a66f9d0f6e73a2c342272fcadc71':
  Fix the build

12 years agoam e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
Wu-cheng Li [Tue, 22 Nov 2011 02:13:06 +0000 (18:13 -0800)]
am e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1

* commit 'e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
  Move Camera.Sound to a stand-alone class CameraSound.

12 years agoMerge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
Wu-cheng Li [Tue, 22 Nov 2011 02:10:52 +0000 (18:10 -0800)]
Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1

12 years agoam 07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfa...
Mathias Agopian [Tue, 22 Nov 2011 02:00:52 +0000 (18:00 -0800)]
am 07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1

* commit '07a2d831903774e07c1c6b6dd5c7c06bf8ca176a':
  don't report an error when disconnecting from an abandoned surfacetexture

12 years agoam 8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
Mathias Agopian [Tue, 22 Nov 2011 01:58:42 +0000 (17:58 -0800)]
am 8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1

* commit '8646cd42df5edc5f5b9c52d6ab5309821e875656':
  enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices

12 years agoam 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug...
Romain Guy [Tue, 22 Nov 2011 01:58:40 +0000 (17:58 -0800)]
am 8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1

* commit '8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
  Notify views when EGL resources are about to be destroyed Bug #5639899

12 years agoMerge "don't report an error when disconnecting from an abandoned surfacetexture...
Mathias Agopian [Tue, 22 Nov 2011 01:57:31 +0000 (17:57 -0800)]
Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1

12 years agoMerge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
Mathias Agopian [Tue, 22 Nov 2011 01:57:20 +0000 (17:57 -0800)]
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1

12 years agoMerge "Notify views when EGL resources are about to be destroyed Bug #5639899" into...
Romain Guy [Tue, 22 Nov 2011 01:57:05 +0000 (17:57 -0800)]
Merge "Notify views when EGL resources are about to be destroyed Bug #5639899" into ics-mr1