OSDN Git Service

android-x86/frameworks-native.git
13 years agoMerge "changes to SurfaceTexture needed for unification with SF"
Mathias Agopian [Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)]
Merge "changes to SurfaceTexture needed for unification with SF"

13 years agoMerge "Return chars advances instead of glyphs advances"
Fabrice Di Meglio [Tue, 19 Apr 2011 00:19:36 +0000 (17:19 -0700)]
Merge "Return chars advances instead of glyphs advances"

13 years agoMerge "fix memory corruption when retriving GL_MAX_VIEWPORT_DIMS"
Mathias Agopian [Mon, 18 Apr 2011 23:00:07 +0000 (16:00 -0700)]
Merge "fix memory corruption when retriving GL_MAX_VIEWPORT_DIMS"

13 years agofix memory corruption when retriving GL_MAX_VIEWPORT_DIMS
Mathias Agopian [Mon, 18 Apr 2011 22:59:24 +0000 (15:59 -0700)]
fix memory corruption when retriving GL_MAX_VIEWPORT_DIMS

Change-Id: I2e0b1eac6dbc6a4ecbbaf31013aa02cf2369fce2

13 years agoam 67dc13ed: (-s ours) am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure...
Andreas Huber [Mon, 18 Apr 2011 22:49:06 +0000 (15:49 -0700)]
am 67dc13ed: (-s ours) am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

* commit '67dc13ed6764cd96194f57ee8221c88df551d040':
  DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

13 years agoam 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher...
Andreas Huber [Mon, 18 Apr 2011 22:45:21 +0000 (15:45 -0700)]
am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

* commit '5ce9eb9a34ffac3ff5aea0db81a902a380105d5b':
  DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

13 years agoam f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when tryin...
Andreas Huber [Mon, 18 Apr 2011 22:39:09 +0000 (15:39 -0700)]
am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

* commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5':
  DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.

13 years agoam 37677849: am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to...
Wink Saville [Mon, 18 Apr 2011 22:28:47 +0000 (15:28 -0700)]
am 37677849: am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

* commit '37677849998e6c9a39afe0a730b2f0131a371f3b':
  Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

13 years agoMerge "GLES2Dbg: added CaptureDraw and CaptureSwap options"
David Li [Mon, 18 Apr 2011 22:26:59 +0000 (15:26 -0700)]
Merge "GLES2Dbg: added CaptureDraw and CaptureSwap options"

13 years agoMerge "GLES2Dbg: use dump.gles2dbg file when fails to create socket"
David Li [Mon, 18 Apr 2011 22:26:51 +0000 (15:26 -0700)]
Merge "GLES2Dbg: use dump.gles2dbg file when fails to create socket"

13 years agoMerge "GLES2Dbg: add EXTEND_AFTER_CALL_Debug_* macro and improve protocol"
David Li [Mon, 18 Apr 2011 22:26:39 +0000 (15:26 -0700)]
Merge "GLES2Dbg: add EXTEND_AFTER_CALL_Debug_* macro and improve protocol"

13 years agoMerge "GLES2Dbg: change GLES2_dbg to shared library"
David Li [Mon, 18 Apr 2011 22:26:31 +0000 (15:26 -0700)]
Merge "GLES2Dbg: change GLES2_dbg to shared library"

13 years agoam 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine...
Wink Saville [Mon, 18 Apr 2011 22:24:47 +0000 (15:24 -0700)]
am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

* commit '64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
  Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

13 years agoMerge "Integrate from support lib: fix restore of list state."
Dianne Hackborn [Mon, 18 Apr 2011 21:23:04 +0000 (14:23 -0700)]
Merge "Integrate from support lib: fix restore of list state."

13 years agoam 9a2c9390: am 6f200f73: Merge "Data connection attempts/retries for multiple APNs...
Wink Saville [Mon, 18 Apr 2011 20:39:49 +0000 (13:39 -0700)]
am 9a2c9390: am 6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE

* commit '9a2c93905a2a65db7135f48ca5653d3cf614faed':
  Data connection attempts/retries for multiple APNs

13 years agoam 6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycom...
Wink Saville [Mon, 18 Apr 2011 20:36:32 +0000 (13:36 -0700)]
am 6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE

* commit '6f200f738ed0bbdef5c433b5f571fcb591e1760c':
  Data connection attempts/retries for multiple APNs

13 years agoMerge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
Wink Saville [Mon, 18 Apr 2011 20:28:49 +0000 (13:28 -0700)]
Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE

13 years agoMerge "Only return default TTS engines from TTS.getEngines()"
Bjorn Bringert [Mon, 18 Apr 2011 19:34:47 +0000 (12:34 -0700)]
Merge "Only return default TTS engines from TTS.getEngines()"

13 years agoMerge "Fix bug 2659754 ConcurrentModificationException in audio focus changes"
Jean-Michel Trivi [Mon, 18 Apr 2011 18:20:20 +0000 (11:20 -0700)]
Merge "Fix bug 2659754 ConcurrentModificationException in audio focus changes"

13 years agoMerge "Add Unicode BiDi Algo before drawing text in Canvas"
Fabrice Di Meglio [Mon, 18 Apr 2011 18:15:57 +0000 (11:15 -0700)]
Merge "Add Unicode BiDi Algo before drawing text in Canvas"

13 years agoMerge "Fix bug 2724503 Persist media button receiver across reboots"
Jean-Michel Trivi [Mon, 18 Apr 2011 18:02:34 +0000 (11:02 -0700)]
Merge "Fix bug 2724503 Persist media button receiver across reboots"

13 years agoMerge "Fix broken assert (if input allocation is NULL)."
Stephen Hines [Mon, 18 Apr 2011 17:25:57 +0000 (10:25 -0700)]
Merge "Fix broken assert (if input allocation is NULL)."

13 years agoMerge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"
Andreas Huber [Mon, 18 Apr 2011 15:12:36 +0000 (08:12 -0700)]
Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"

13 years agoam 62174ac1: am 74c890a5: am 1f07f125: am 6669f251: docs: fix snippet errors in web doc
Scott Main [Mon, 18 Apr 2011 10:28:26 +0000 (03:28 -0700)]
am 62174ac1: am 74c890a5: am 1f07f125: am 6669f251: docs: fix snippet errors in web doc

* commit '62174ac1a203e2ab57fd91837e7e67b0c578ecbe':
  docs: fix snippet errors in web doc

13 years agoam 74c890a5: am 1f07f125: am 6669f251: docs: fix snippet errors in web doc
Scott Main [Mon, 18 Apr 2011 10:18:06 +0000 (03:18 -0700)]
am 74c890a5: am 1f07f125: am 6669f251: docs: fix snippet errors in web doc

* commit '74c890a57a819a0245573987455088c111e2c4eb':
  docs: fix snippet errors in web doc

13 years agoam 1f07f125: am 6669f251: docs: fix snippet errors in web doc
Scott Main [Mon, 18 Apr 2011 10:08:32 +0000 (03:08 -0700)]
am 1f07f125: am 6669f251: docs: fix snippet errors in web doc

* commit '1f07f1257b62f2ac71696bb430f9328597c3de27':
  docs: fix snippet errors in web doc

13 years agoam 5f7edb2c: am a9378485: Merge "Telephony: GDCT - Set enabled state before notificat...
Wink Saville [Sat, 16 Apr 2011 21:52:04 +0000 (14:52 -0700)]
am 5f7edb2c: am a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE

* commit '5f7edb2c53b2432ea3426c563d9743338ba1d064':
  Telephony: GDCT - Set enabled state before notification is sent out.

13 years agoam d86e06f7: am df43e321: Merge "Telephony: Set Radio turned off reason when powered...
Wink Saville [Sat, 16 Apr 2011 21:50:10 +0000 (14:50 -0700)]
am d86e06f7: am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE

* commit 'd86e06f7db0705b5fa64f23dcecf305133d2acc7':
  Telephony: Set Radio turned off reason when powered off.

13 years agoam fa65533e: am dc26a0c8: Merge "Clean up calls immediately if cid become inactive...
Wink Saville [Sat, 16 Apr 2011 21:50:06 +0000 (14:50 -0700)]
am fa65533e: am dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE

* commit 'fa65533ef11e794b21580e5583a74d2d8ffb7047':
  Clean up calls immediately if cid become inactive in unsol data state changed

13 years agoam a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent...
Wink Saville [Sat, 16 Apr 2011 21:49:07 +0000 (14:49 -0700)]
am a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE

* commit 'a9378485cb8d0968a9a177f730875e0f1d49d689':
  Telephony: GDCT - Set enabled state before notification is sent out.

13 years agoam 6708e008: am 585b7acb: Merge "handle missing constants when creating a Phone insta...
Wink Saville [Sat, 16 Apr 2011 21:48:10 +0000 (14:48 -0700)]
am 6708e008: am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE

* commit '6708e008ef29b5221960d3b42ca8fcc192108192':
  handle missing constants when creating a Phone instance

13 years agoam dff90b7d: am a5c9c724: Data Availability Indication changes.
Ramesh Sudini [Sat, 16 Apr 2011 21:47:56 +0000 (14:47 -0700)]
am dff90b7d: am a5c9c724: Data Availability Indication changes.

* commit 'dff90b7d161bd7d11d931a43aad79d87e7f4dfc1':
  Data Availability Indication changes.

13 years agoam df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into...
Wink Saville [Sat, 16 Apr 2011 21:47:17 +0000 (14:47 -0700)]
am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE

* commit 'df43e321778a02f9eaeb8faacf4ae7917c434106':
  Telephony: Set Radio turned off reason when powered off.

13 years agoam dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data...
Wink Saville [Sat, 16 Apr 2011 21:47:15 +0000 (14:47 -0700)]
am dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE

* commit 'dc26a0c8d4ce4edcddcfc6b8e810ae5f8e73cda4':
  Clean up calls immediately if cid become inactive in unsol data state changed

13 years agoMerge "Telephony: GDCT - Set enabled state before notification is sent out." into...
Wink Saville [Sat, 16 Apr 2011 21:45:42 +0000 (14:45 -0700)]
Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE

13 years agoam 585b7acb: Merge "handle missing constants when creating a Phone instance" into...
Wink Saville [Sat, 16 Apr 2011 21:45:28 +0000 (14:45 -0700)]
am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE

* commit '585b7acb16183ae31e71912dc2bfceea421be157':
  handle missing constants when creating a Phone instance

13 years agoam a5c9c724: Data Availability Indication changes.
Ramesh Sudini [Sat, 16 Apr 2011 21:45:19 +0000 (14:45 -0700)]
am a5c9c724: Data Availability Indication changes.

* commit 'a5c9c7246b065710227395ec4a7c1df0168363ef':
  Data Availability Indication changes.

13 years agoMerge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
Wink Saville [Sat, 16 Apr 2011 21:44:08 +0000 (14:44 -0700)]
Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE

13 years agoMerge "Clean up calls immediately if cid become inactive in unsol data state changed...
Wink Saville [Sat, 16 Apr 2011 21:43:30 +0000 (14:43 -0700)]
Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE

13 years agoMerge "handle missing constants when creating a Phone instance" into honeycomb-LTE
Wink Saville [Sat, 16 Apr 2011 21:42:49 +0000 (14:42 -0700)]
Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE

13 years agoMerge "Fix a GraphicBuffer leak in SurfaceTexture"
Mathias Agopian [Sat, 16 Apr 2011 01:15:13 +0000 (18:15 -0700)]
Merge "Fix a GraphicBuffer leak in SurfaceTexture"

13 years agoam 6669f251: docs: fix snippet errors in web doc
Scott Main [Sat, 16 Apr 2011 01:03:14 +0000 (18:03 -0700)]
am 6669f251: docs: fix snippet errors in web doc

* commit '6669f251391d7e61a6ea55e2538c941f82514dd9':
  docs: fix snippet errors in web doc

13 years agoam 9bd1368b: am 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE
Wink Saville [Fri, 15 Apr 2011 22:48:48 +0000 (15:48 -0700)]
am 9bd1368b: am 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE

* commit '9bd1368bb431d701604a48b226ee362fc7838c6a':
  Cleanup/add log statements.

13 years agoam 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE
Wink Saville [Fri, 15 Apr 2011 22:46:27 +0000 (15:46 -0700)]
am 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE

* commit '6ed4798c70bf4ba253a8cdd37bf48008af81da7d':
  Cleanup/add log statements.

13 years agoMerge "Cleanup/add log statements." into honeycomb-LTE
Wink Saville [Fri, 15 Apr 2011 22:44:18 +0000 (15:44 -0700)]
Merge "Cleanup/add log statements." into honeycomb-LTE

13 years agoam 93a3f72a: am cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE
Wink Saville [Fri, 15 Apr 2011 22:41:35 +0000 (15:41 -0700)]
am 93a3f72a: am cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE

* commit '93a3f72aa0475e08bbe7de8d512f7149428aaf2d':
  Change RIL initialization.

13 years agoam cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE
Wink Saville [Fri, 15 Apr 2011 22:39:09 +0000 (15:39 -0700)]
am cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE

* commit 'cb0c5f16e9131e73cda38ce18c00a31b1d5be2c3':
  Change RIL initialization.

13 years agoMerge "Change RIL initialization." into honeycomb-LTE
Wink Saville [Fri, 15 Apr 2011 22:36:43 +0000 (15:36 -0700)]
Merge "Change RIL initialization." into honeycomb-LTE

13 years agoMerge "Import revised translations."
Eric Fischer [Fri, 15 Apr 2011 22:01:11 +0000 (15:01 -0700)]
Merge "Import revised translations."

13 years agoMerge "More battery stats improvements."
Dianne Hackborn [Fri, 15 Apr 2011 19:54:15 +0000 (12:54 -0700)]
Merge "More battery stats improvements."

13 years agoMerge "Improve TTS engine audio buffer API"
Bjorn Bringert [Fri, 15 Apr 2011 14:28:40 +0000 (07:28 -0700)]
Merge "Improve TTS engine audio buffer API"

13 years agoMerge "Fix camera javadoc errors."
Wu-cheng Li [Fri, 15 Apr 2011 11:21:43 +0000 (04:21 -0700)]
Merge "Fix camera javadoc errors."

13 years agoMerge "Adding WebElement.java which provides DOM friendly API function to lookup...
Steve Block [Fri, 15 Apr 2011 10:17:46 +0000 (03:17 -0700)]
Merge "Adding WebElement.java which provides DOM friendly API function to lookup HTML elements in the page."

13 years agoAdd Java API for writing TTS engines
Bjorn Bringert [Tue, 8 Mar 2011 16:00:40 +0000 (16:00 +0000)]
Add Java API for writing TTS engines

This removes the old non-public C++ API for TTS
engines and replaces it with a Java API.

The new API is still @hidden, until it has been approved.

Bug: 4148636
Change-Id: I7614ff788e11f897e87052f684f1b4938d539fb7

13 years agoMerge "Use system IME for LockScreen password mode."
Jim Miller [Fri, 15 Apr 2011 08:07:45 +0000 (01:07 -0700)]
Merge "Use system IME for LockScreen password mode."

13 years agoMerge "Replace a custom AndroidRuntime::findClass with a more targeted fix."
Elliott Hughes [Fri, 15 Apr 2011 00:00:52 +0000 (17:00 -0700)]
Merge "Replace a custom AndroidRuntime::findClass with a more targeted fix."

13 years agoam 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes...
Dianne Hackborn [Thu, 14 Apr 2011 22:43:03 +0000 (15:43 -0700)]
am 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

* commit '07a630d23ef326f820e6339b5f691df0aafd3574':
  Fix issue #4291805: Tap Fish crashes on launch

13 years agoam 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch"...
Dianne Hackborn [Thu, 14 Apr 2011 22:40:00 +0000 (15:40 -0700)]
am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

* commit '9a03a73a44c69706fe2b97a28632928f58b434b1':
  Fix issue #4291805: Tap Fish crashes on launch

13 years agoam f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1
Dianne Hackborn [Thu, 14 Apr 2011 22:27:32 +0000 (15:27 -0700)]
am f6f87c98: Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

* commit 'f6f87c985989603139b31df663f9f9a90543cacc':
  Fix issue #4291805: Tap Fish crashes on launch

13 years agoMerge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1
Dianne Hackborn [Thu, 14 Apr 2011 22:10:31 +0000 (15:10 -0700)]
Merge "Fix issue #4291805: Tap Fish crashes on launch" into honeycomb-mr1

13 years agoam 1bfb2db9: (-s ours) am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import...
Eric Fischer [Thu, 14 Apr 2011 22:04:41 +0000 (15:04 -0700)]
am 1bfb2db9: (-s ours) am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '1bfb2db93514f8ed70d0a02c12d7ce4791d6b336':
  Import revised translations.  DO NOT MERGE

13 years agoam cc0cfcf2: am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA...
Scott Main [Thu, 14 Apr 2011 22:04:17 +0000 (15:04 -0700)]
am cc0cfcf2: am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs

* commit 'cc0cfcf2ece4610126b7b213af2673da45772270':
  docs: bring back the SDK EULA wall for downloading archived SDKs

13 years agoam b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations...
Eric Fischer [Thu, 14 Apr 2011 21:29:19 +0000 (14:29 -0700)]
am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit 'b590ca85afba6b886cc995e9a6092457174ea016':
  Import revised translations.  DO NOT MERGE

13 years agoam 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE...
Eric Fischer [Thu, 14 Apr 2011 21:26:46 +0000 (14:26 -0700)]
am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '4e3d6aa0688f023dfe5feb2eb197207cc8267463':
  Import revised translations.  DO NOT MERGE

13 years agoam a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloa...
Scott Main [Thu, 14 Apr 2011 21:23:23 +0000 (14:23 -0700)]
am a4f4a843: am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs

* commit 'a4f4a8431caaef4e1381acc41a84e44e99a13e37':
  docs: bring back the SDK EULA wall for downloading archived SDKs

13 years agoam d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Thu, 14 Apr 2011 21:21:57 +0000 (14:21 -0700)]
am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit 'd284a8676e002a72b66d321402ec7f4ed61c7915':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Thu, 14 Apr 2011 21:14:46 +0000 (14:14 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb

13 years agoam 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived...
Scott Main [Thu, 14 Apr 2011 21:08:51 +0000 (14:08 -0700)]
am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs

* commit '2a08e7bf6778fe7494be45c7231e2df3edce5ab4':
  docs: bring back the SDK EULA wall for downloading archived SDKs

13 years agoam d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
Scott Main [Thu, 14 Apr 2011 20:55:16 +0000 (13:55 -0700)]
am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs

* commit 'd08debcb211ec2e369c8c88ce15e4aaadd54a8d4':
  docs: bring back the SDK EULA wall for downloading archived SDKs

13 years agoMerge "Address comments for dalvik/docs/jni-tips.html documentation."
Elliott Hughes [Thu, 14 Apr 2011 19:54:27 +0000 (12:54 -0700)]
Merge "Address comments for dalvik/docs/jni-tips.html documentation."

13 years agoMerge "First bits of WebDriver containing blocking function to load a page and fetchi...
Steve Block [Thu, 14 Apr 2011 18:07:04 +0000 (11:07 -0700)]
Merge "First bits of WebDriver containing blocking function to load a page and fetching the page source."

13 years agoMerge "Rewrite battery history storage."
Dianne Hackborn [Thu, 14 Apr 2011 17:58:28 +0000 (10:58 -0700)]
Merge "Rewrite battery history storage."

13 years agoRewrite battery history storage.
Dianne Hackborn [Thu, 14 Apr 2011 01:15:56 +0000 (18:15 -0700)]
Rewrite battery history storage.

We now write battery history directly into a buffer, instead of
creating objects.  This allows for more efficient storage; later
it can be even better because we can only write deltas.

The old code is still there temporarily for validation.

Change-Id: I9707d4d8ff30855be8ebdc93bc078911040d8e0b

13 years agoMerge "Add the old dalvik/docs/jni-tips.html documentation."
Elliott Hughes [Thu, 14 Apr 2011 17:43:40 +0000 (10:43 -0700)]
Merge "Add the old dalvik/docs/jni-tips.html documentation."

13 years agoMerge "Fix around suggestionSpan."
Gilles Debunne [Thu, 14 Apr 2011 17:38:05 +0000 (10:38 -0700)]
Merge "Fix around suggestionSpan."

13 years agoReplace a custom AndroidRuntime::findClass with a more targeted fix.
Elliott Hughes [Wed, 13 Apr 2011 22:39:37 +0000 (15:39 -0700)]
Replace a custom AndroidRuntime::findClass with a more targeted fix.

This seems simpler and more contained, and I think the comment explaining
why hoop-jumping is necessary is a bit clearer now.

Change-Id: Ief4afd7cbb42188ed835fce23e497520bdb753a8

13 years agoam a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static...
Xia Wang [Wed, 13 Apr 2011 23:05:07 +0000 (16:05 -0700)]
am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1

* commit 'a4b76ff4911538f01e92af2f3fa3f4016ad0e290':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi

13 years agoam d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property...
Xia Wang [Wed, 13 Apr 2011 22:52:39 +0000 (15:52 -0700)]
am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1

* commit 'd69ec89f5d31064174d79e2e77504814629cffa6':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi

13 years agoMerge "- Add another parameter in notify() to be able to send timed text sample throu...
Gloria Wang [Wed, 13 Apr 2011 22:36:14 +0000 (15:36 -0700)]
Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."

13 years agoam 46b59ef0: Merge "Fix access point parsing: reset static link property after parsin...
Xia Wang [Wed, 13 Apr 2011 22:34:29 +0000 (15:34 -0700)]
am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1

* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi

13 years agoMerge "Fix access point parsing: reset static link property after parsing static...
Xia Wang [Wed, 13 Apr 2011 22:13:10 +0000 (15:13 -0700)]
Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1

13 years agoam 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
Glenn Kasten [Wed, 13 Apr 2011 18:56:41 +0000 (11:56 -0700)]
am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code

* commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a':
  Bug 4167061 remove debugging code

13 years agoam 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
Glenn Kasten [Wed, 13 Apr 2011 18:52:32 +0000 (11:52 -0700)]
am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code

* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
  Bug 4167061 remove debugging code

13 years agoam b0d6f10e: Bug 4167061 remove debugging code
Glenn Kasten [Wed, 13 Apr 2011 18:48:28 +0000 (11:48 -0700)]
am b0d6f10e: Bug 4167061 remove debugging code

* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
  Bug 4167061 remove debugging code

13 years agoMerge "Fix a typo in FrameLayout JavaDoc"
Steve Block [Wed, 13 Apr 2011 18:10:17 +0000 (11:10 -0700)]
Merge "Fix a typo in FrameLayout JavaDoc"

13 years agoMerge "More native code cleanup."
Elliott Hughes [Wed, 13 Apr 2011 18:09:57 +0000 (11:09 -0700)]
Merge "More native code cleanup."

13 years agoParcel::appendFrom({const } Parcel *parcel, size_t, size_t)
Andreas Huber [Wed, 13 Apr 2011 17:21:56 +0000 (10:21 -0700)]
Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)

As far as I can tell "parcel" isn't actually modified by the implementation.

Change-Id: Ib806eefdc13c97b932773e1dc9ca3a4aad4422b2

13 years agoMerge "Use an @hide libcore API to get the FileDescriptor from a Socket."
Elliott Hughes [Wed, 13 Apr 2011 17:18:03 +0000 (10:18 -0700)]
Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."

13 years agoMerge "Don't allocate a raw object then call its constructor manually..."
Elliott Hughes [Wed, 13 Apr 2011 17:17:46 +0000 (10:17 -0700)]
Merge "Don't allocate a raw object then call its constructor manually..."

13 years agoMerge "Add camera metering area API."
Wu-cheng Li [Wed, 13 Apr 2011 08:14:42 +0000 (01:14 -0700)]
Merge "Add camera metering area API."

13 years agoam 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
Wink Saville [Wed, 13 Apr 2011 00:03:29 +0000 (17:03 -0700)]
am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
  Fix occasional phone app crash

13 years agoam c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
Wink Saville [Wed, 13 Apr 2011 00:00:57 +0000 (17:00 -0700)]
am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
  Fix occasional phone app crash

13 years agoMerge "Fix occasional phone app crash" into honeycomb-LTE
Wink Saville [Tue, 12 Apr 2011 23:53:54 +0000 (16:53 -0700)]
Merge "Fix occasional phone app crash" into honeycomb-LTE

13 years agoMerge "Remove useless forward declarations."
Elliott Hughes [Tue, 12 Apr 2011 23:29:49 +0000 (16:29 -0700)]
Merge "Remove useless forward declarations."

13 years agoGLES2Dbg: added CaptureDraw and CaptureSwap options
David Li [Sat, 9 Apr 2011 01:45:45 +0000 (18:45 -0700)]
GLES2Dbg: added CaptureDraw and CaptureSwap options

CaptureDraw specifies how many glDrawArrays/Elements to glReadPixel
CaptureSwap similarly applies to eglSwapBuffers

Change-Id: Ie7a7e3392b4ecdc0659dcee04f4bab97c35267dc
Signed-off-by: David Li <davidxli@google.com>
13 years agoGLES2Dbg: use dump.gles2dbg file when fails to create socket
David Li [Sat, 9 Apr 2011 01:43:16 +0000 (18:43 -0700)]
GLES2Dbg: use dump.gles2dbg file when fails to create socket

setprop debug.egl.debug_forceUseFile 1: always use file
setprop debug.egl.debug_maxFileSize <int MB>: exit when reached
setprop debug.egl.debug_filePath <path>: may need to make the file
 writable first.
setprop debug.egl.debug_port <unsigned short>
setprop debug.egl.debug_proc <proc cmdline>: to match debuggee process

Change-Id: I34ca1f3092f3abf17e2ded9d1689d0cdef6e07e8
Signed-off-by: David Li <davidxli@google.com>
13 years agoGLES2Dbg: add EXTEND_AFTER_CALL_Debug_* macro and improve protocol
David Li [Sat, 9 Apr 2011 01:41:00 +0000 (18:41 -0700)]
GLES2Dbg: add EXTEND_AFTER_CALL_Debug_* macro and improve protocol

To allow auto generate of Debug_glReadPixels function.
Also added AfterGeneratedCall messag type, and client override
 of expectResponse for improving protocol.
Also implemented callers for client to get shader/program iv & infolog

Change-Id: I8426de0be4b7ffcb8b2b4f063ad85d19a9d2d72e
Signed-off-by: David Li <davidxli@google.com>
13 years agoGLES2Dbg: change GLES2_dbg to shared library
David Li [Mon, 28 Mar 2011 17:39:28 +0000 (10:39 -0700)]
GLES2Dbg: change GLES2_dbg to shared library

Change-Id: I493e9bff431bd939f4e80e1e9c614dd557307fa2
Signed-off-by: David Li <davidxli@google.com>
13 years agoMerge "Updated system packages retain shared user"
Kenny Root [Tue, 12 Apr 2011 22:34:42 +0000 (15:34 -0700)]
Merge "Updated system packages retain shared user"

13 years agoam bf3452f3: am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo
Scott Main [Tue, 12 Apr 2011 21:55:32 +0000 (14:55 -0700)]
am bf3452f3: am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo

* commit 'bf3452f36c768808873e5428e3594c7eaec0a10c':
  docs: fix doc typo