Commit Graph

11539 Commits

Author SHA1 Message Date
Christopher Tate
7d900f2697 resolved conflicts for merge of 2624fbca to eclair-mr2 2009-12-11 13:16:41 -08:00
Andreas Huber
c2833b53e3 am e86a37c6: am 8eac1637: Merge change I85adf5e5 into eclair-mr2
Merge commit 'e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8'

* commit 'e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8':
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
2009-12-11 13:06:05 -08:00
Christopher Tate
91f1a1c57a am 2624fbca: Fix #2320798: Device hang then runtime restart
Merge commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2' into eclair-plus-aosp

* commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2':
  Fix #2320798: Device hang then runtime restart
2009-12-11 13:05:57 -08:00
Andreas Huber
23e1b91e2c am 8eac1637: Merge change I85adf5e5 into eclair-mr2
Merge commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23' into eclair-mr2-plus-aosp

* commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23':
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
2009-12-11 13:01:12 -08:00
Android (Google) Code Review
a22790ef39 Merge change I85adf5e5 into eclair-mr2
* changes:
  Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
2009-12-11 12:56:30 -08:00
Ken Shirriff
7893bb4acd am 9ed0a872: am 930ab3d9: Fix broken sdk build.
Merge commit '9ed0a8721990303e6264c6affb93b25c8249127b'

* commit '9ed0a8721990303e6264c6affb93b25c8249127b':
  Fix broken sdk build.
2009-12-11 12:42:43 -08:00
Ken Shirriff
f22f7af324 am 930ab3d9: Fix broken sdk build.
Merge commit '930ab3d955a40c1de167b7142215af37f9f9bfe4' into eclair-mr2-plus-aosp

* commit '930ab3d955a40c1de167b7142215af37f9f9bfe4':
  Fix broken sdk build.
2009-12-11 12:38:07 -08:00
Andreas Huber
8c302e0dca am ea113f30: am d8729c59: Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
Merge commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e'

* commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e':
  Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
2009-12-11 10:11:43 -08:00
Andreas Huber
2050e777ca am d8729c59: Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
Merge commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b' into eclair-mr2-plus-aosp

* commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b':
  Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
2009-12-11 10:06:30 -08:00
Andreas Huber
0afcb78549 am 554647e9: am 6ddcf01a: remote destructors are not synchronously executed by the binder...
Merge commit '554647e963432d34c41e69e4c6c0c6e4cb08e80e'

* commit '554647e963432d34c41e69e4c6c0c6e4cb08e80e':
  remote destructors are not synchronously executed by the binder...
2009-12-11 09:14:31 -08:00
Andreas Huber
4ad11f1636 am 63b3a29d: am c1d5c921: Fix seek-on-startup behaviour in AwesomePlayer.
Merge commit '63b3a29d4fe85d709403c1030d221d97f89b9744'

* commit '63b3a29d4fe85d709403c1030d221d97f89b9744':
  Fix seek-on-startup behaviour in AwesomePlayer.
2009-12-11 09:14:22 -08:00
Andreas Huber
15ed0b070d am 9ec965e4: am b78599b7: Merge change Ia67d5388 into eclair-mr2
Merge commit '9ec965e4fb242c9c570e43980425b8f275eb2159'

* commit '9ec965e4fb242c9c570e43980425b8f275eb2159':
  remote destructors are not synchronously executed by the binder...
2009-12-11 09:14:07 -08:00
Andreas Huber
8abcc28ddc am 6ddcf01a: remote destructors are not synchronously executed by the binder...
Merge commit '6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1' into eclair-mr2-plus-aosp

* commit '6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1':
  remote destructors are not synchronously executed by the binder...
2009-12-11 09:09:29 -08:00
Andreas Huber
06db96d79e am c1d5c921: Fix seek-on-startup behaviour in AwesomePlayer.
Merge commit 'c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2' into eclair-mr2-plus-aosp

* commit 'c1d5c921d62475fb0b9eec46ce1a9278c96fd9e2':
  Fix seek-on-startup behaviour in AwesomePlayer.
2009-12-11 09:06:43 -08:00
Andreas Huber
eda23f2942 am b78599b7: Merge change Ia67d5388 into eclair-mr2
Merge commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740' into eclair-mr2-plus-aosp

* commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740':
  remote destructors are not synchronously executed by the binder...
2009-12-11 09:06:36 -08:00
Mike Reed
940978ab96 am be35a4fd: am 6cb69c7d: Merge change I8b302097 into eclair-mr2
Merge commit 'be35a4fd8c26749aba27731270f75273dc1590fe'

* commit 'be35a4fd8c26749aba27731270f75273dc1590fe':
  Update the zoom buttons after moving to a new page.
2009-12-11 08:50:35 -08:00
Andreas Huber
5055c58f97 am fd672a8a: am fd499830: Merge change I595c2d60 into eclair-mr2
Merge commit 'fd672a8a8cde8d1d22878e966e8f10470966541f'

* commit 'fd672a8a8cde8d1d22878e966e8f10470966541f':
  Initial checkin of software AVC video decoder based on PV source code.
2009-12-11 08:50:26 -08:00
Android (Google) Code Review
43f36c1ec6 Merge change Ia67d5388 into eclair-mr2
* changes:
  remote destructors are not synchronously executed by the binder...
2009-12-11 08:48:47 -08:00
Mike Reed
162e378dc5 am 6cb69c7d: Merge change I8b302097 into eclair-mr2
Merge commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584' into eclair-mr2-plus-aosp

* commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584':
  Update the zoom buttons after moving to a new page.
2009-12-11 08:44:40 -08:00
Andreas Huber
1854223d3c am fd499830: Merge change I595c2d60 into eclair-mr2
Merge commit 'fd49983009e9e68de5d3f7f5c93689c8da1a9b6c' into eclair-mr2-plus-aosp

* commit 'fd49983009e9e68de5d3f7f5c93689c8da1a9b6c':
  Initial checkin of software AVC video decoder based on PV source code.
2009-12-11 08:43:01 -08:00
Android (Google) Code Review
153d3158b4 Merge change I8b302097 into eclair-mr2
* changes:
  Update the zoom buttons after moving to a new page.
2009-12-11 08:42:13 -08:00
Android (Google) Code Review
9a044a685f Merge change I595c2d60 into eclair-mr2
* changes:
  Initial checkin of software AVC video decoder based on PV source code.
2009-12-11 08:39:00 -08:00
Android (Google) Code Review
0b4d45e4e3 Merge change I3e370934
* changes:
  remove classes from the preloaded list
2009-12-11 07:47:34 -08:00
Maryam Garrett
8d48ebec20 am fe9b503e: am 946bfa49: Merge change Ida4d6ab0 into eclair-mr2
Merge commit 'fe9b503e57e3efc1909121db65dd470d908cc938'

* commit 'fe9b503e57e3efc1909121db65dd470d908cc938':
  Allows users to scroll while in select mode.
2009-12-11 06:31:02 -08:00
Mathias Agopian
03fd6fca14 am 2378f141: am b63d91c6: am f9b0e826: fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
Merge commit '2378f1413426987ccfe9d6ed5f856bb01c9d7c30'

* commit '2378f1413426987ccfe9d6ed5f856bb01c9d7c30':
  fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
2009-12-11 06:30:53 -08:00
Maryam Garrett
e47f7cf6e1 am 946bfa49: Merge change Ida4d6ab0 into eclair-mr2
Merge commit '946bfa490a4df62bfb48e8017c329b052e3e905e' into eclair-mr2-plus-aosp

* commit '946bfa490a4df62bfb48e8017c329b052e3e905e':
  Allows users to scroll while in select mode.
2009-12-11 06:27:21 -08:00
Mathias Agopian
7f7a38f30a am b63d91c6: am f9b0e826: fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
Merge commit 'b63d91c6fc90ee8f71bad9380b45dfe6b5d96f57' into eclair-mr2-plus-aosp

* commit 'b63d91c6fc90ee8f71bad9380b45dfe6b5d96f57':
  fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
2009-12-11 06:27:13 -08:00
Android (Google) Code Review
5c05b4dcc1 Merge change Ida4d6ab0 into eclair-mr2
* changes:
  Allows users to scroll while in select mode.
2009-12-11 06:22:12 -08:00
Wink Saville
a55346404e am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2
Merge commit '595c40920f31ba7b6674eb341548173e2aaf6ea7'

* commit '595c40920f31ba7b6674eb341548173e2aaf6ea7':
  Implement a HierarchicalStateMachine
2009-12-11 01:40:43 -08:00
Kenny Root
6f91ee23e1 am cdbf5746: am b5ef7ee1: Default to UTF8 resources when packaging with aapt
Merge commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b'

* commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b':
  Default to UTF8 resources when packaging with aapt
2009-12-11 01:40:19 -08:00
Roman Nurik
ed5d027cc0 am 87e9b8f1: am 05bbeb35: am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '87e9b8f14e0555351b892cf67578a7d26c4505c8'

* commit '87e9b8f14e0555351b892cf67578a7d26c4505c8':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
2009-12-11 01:40:06 -08:00
Mathias Agopian
4bd74e81f7 am 871f9de3: am 02472639: am 083a557c: fix [2319255] crash in openGL : from the media recorder stress test.
Merge commit '871f9de3554ccfd2028837dea97b76fcaf5ffedb'

* commit '871f9de3554ccfd2028837dea97b76fcaf5ffedb':
  fix [2319255] crash in openGL : from the media recorder stress test.
2009-12-11 01:39:53 -08:00
Mathias Agopian
839604c769 am f9b0e826: fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
Merge commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2' into eclair-mr2

* commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2':
  fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
2009-12-11 01:16:08 -08:00
Mathias Agopian
a4d1a996b6 am f9b0e826: fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
Merge commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2' into eclair-plus-aosp

* commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2':
  fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
2009-12-11 01:14:50 -08:00
Mathias Agopian
f5430db059 fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
When a surface is removed from the screen while it holds a "freeze lock", the
release of that lock happens in the destructor as a "safety net". However, it
doesn't trigger an update at that point.

Make sure that "freeze locks" are released from the transaction at the point
a surface is removed from the screen (if it's not on screen, it shouldn't
prevent the screen to redraw, and therefore cannot hold a freeze lock).
The refresh corresponding to that transaction will pick it up as soon as possible.
2009-12-11 00:56:10 -08:00
Kenny Root
975e03a91e am 1e1d4492: am 218aa945: Merge change I6478884a into eclair-mr2
Merge commit '1e1d44924a334637f9fb47ca8796625bd86cb66a'

* commit '1e1d44924a334637f9fb47ca8796625bd86cb66a':
  Add string resource type inspection
2009-12-10 23:46:34 -08:00
Trevor Johns
4ec6af253c am c267c901: am 9de0dba3: am b9b45a5e: Merge change I24bb662a into eclair
Merge commit 'c267c90100ff09ab1ca6b09d6eae23594d699536'

* commit 'c267c90100ff09ab1ca6b09d6eae23594d699536':
  Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
2009-12-10 23:46:23 -08:00
Dave Sparks
f2e7b362cb am f63779b3: am 9472b35b: am 14f89404: Fix media player decode function. Bug 2317821.
Merge commit 'f63779b392275265b3b13728c78a0a5f4ac10c01'

* commit 'f63779b392275265b3b13728c78a0a5f4ac10c01':
  Fix media player decode function. Bug 2317821.
2009-12-10 23:46:11 -08:00
Dianne Hackborn
7c2910e2ae am 436b93b5: am 221fa910: am d3cfb1bd: Merge change Ia48b3f2a into eclair
Merge commit '436b93b5f577549801489bff228f1a5761f331ff'

* commit '436b93b5f577549801489bff228f1a5761f331ff':
  Fix #2313887: Device doesn't boot after rebooting device...
2009-12-10 23:46:00 -08:00
Scott Main
240d690dd7 am 94065a29: am f210f048: am 88ff62db: Merge change I06398298 into eclair
Merge commit '94065a29c1c68ecf6aa0979a4c91f2616227f264'

* commit '94065a29c1c68ecf6aa0979a4c91f2616227f264':
  docs: add images used in BT developer guide.
2009-12-10 23:45:48 -08:00
Jean-Baptiste Queru
80cdd350d5 am 926d1a22: am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2
Merge commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e'

* commit '926d1a22007d94ef2b29ec979ab6038fa8d9e40e':
  Add --custom-package to aapt
2009-12-10 23:43:25 -08:00
Scott Main
0ac7df4453 am 4570dfa2: am 7b0463a9: am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d'

* commit '4570dfa2016fa32b6f7b29aabadb9d708482b94d':
  docs: add the Bluetooth developer guide,
2009-12-10 23:43:12 -08:00
Eric Fischer
e3ba492e75 am 71988369: (-s ours) am 4d272fe9: am 282a7423: (-s ours) Merge change I3c299167 into eclair
Merge commit '71988369e394870056a55ca142fd4aaf5264ef41'

* commit '71988369e394870056a55ca142fd4aaf5264ef41':
  Import revised translations.  DO NOT MERGE
2009-12-10 23:42:58 -08:00
Trevor Johns
8920dcacbc am 8a00170a: am 1d3a94a8: am abd6c278: Merge change I54400322 into eclair
Merge commit '8a00170ad077e73fee4b379d15015b880ba39fde'

* commit '8a00170ad077e73fee4b379d15015b880ba39fde':
  Adding screenshots for development/samples/ContactManager documentation.
2009-12-10 23:42:44 -08:00
Jaikumar Ganesh
a563def03c am a8ba9f20: am 368c332d: am f6e32e72: Merge change Icced7a09 into eclair
Merge commit 'a8ba9f20ea7b3eae0430baefe8681cba285565f4'

* commit 'a8ba9f20ea7b3eae0430baefe8681cba285565f4':
  Maintain a list of all Bluetooth docks.
2009-12-10 23:42:30 -08:00
Mathias Agopian
b478159bb3 am abcb3703: am 75ca58d6: am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera
Merge commit 'abcb37038a4981e935e516dd4d56cecd1f6fcb39'

* commit 'abcb37038a4981e935e516dd4d56cecd1f6fcb39':
  fix [2315900] Monochrome camera preview screen after launching camera
2009-12-10 23:42:13 -08:00
Wink Saville
1ff13549c0 am 8fb0faf3: Merge change I0a56959e into eclair-mr2
Merge commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c' into eclair-mr2-plus-aosp

* commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c':
  Implement a HierarchicalStateMachine
2009-12-10 21:24:59 -08:00
Android (Google) Code Review
eb301e0ace Merge change I0a56959e into eclair-mr2
* changes:
  Implement a HierarchicalStateMachine
2009-12-10 21:22:19 -08:00
Kenny Root
8d8dd49ab9 am b5ef7ee1: Default to UTF8 resources when packaging with aapt
Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp

* commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3':
  Default to UTF8 resources when packaging with aapt
2009-12-10 20:23:04 -08:00
Roman Nurik
0c5e0eb152 am 05bbeb35: am 7eb6ec1f: Merge change I18305fec into eclair
Merge commit '05bbeb356286bfb6ddc26ac546cce03334e346dd' into eclair-mr2-plus-aosp

* commit '05bbeb356286bfb6ddc26ac546cce03334e346dd':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
2009-12-10 19:57:39 -08:00