Commit Graph

19489 Commits

Author SHA1 Message Date
Dianne Hackborn
08c93a781d Merge "Update script for copying NDK headers/library." into gingerbread 2010-10-22 10:58:35 -07:00
Jeff Hamilton
ecfb0ff159 Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread 2010-10-22 10:20:06 -07:00
Nick Pelly
4dac7a8da2 am 0592832c: Merge "Attempt to fix simulator build." into gingerbread
Merge commit '0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp

* commit '0592832c5e61b9c0008a4410f263ea0b0b991f05':
  Attempt to fix simulator build.
2010-10-22 09:03:21 -07:00
Mike Lockwood
93828eab05 am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
Merge commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b' into gingerbread-plus-aosp

* commit 'f6572e7ee413a87f5d243b3d44f798260ac1a18b':
  GPS: Fix network type logic in requestRefLocation
2010-10-22 09:03:17 -07:00
Kenny Root
9f46e87d1e am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
Merge commit '8ad30b5b7e380428701a44458393cbc2381f205b' into gingerbread-plus-aosp

* commit '8ad30b5b7e380428701a44458393cbc2381f205b':
  Initialized check in ZipFileRO::findEntryByName
2010-10-22 08:59:24 -07:00
Nick Pelly
bf38e48333 Merge "Attempt to fix simulator build." into gingerbread 2010-10-22 08:49:51 -07:00
Mike Lockwood
bcd579d785 Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread 2010-10-22 08:02:09 -07:00
Kenny Root
6d9d44aecc Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread 2010-10-22 07:55:44 -07:00
Hung-ying Tyan
6a382f4bf4 am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
Merge commit '1257d330dcfdb87214278c8fc9718ea9fc663df6' into gingerbread-plus-aosp

* commit '1257d330dcfdb87214278c8fc9718ea9fc663df6':
  Clean up pending sessions on incoming call in SipService
2010-10-21 23:15:20 -07:00
Hung-ying Tyan
21d6871a3c Merge "Clean up pending sessions on incoming call in SipService" into gingerbread 2010-10-21 23:08:59 -07:00
Jeff Hamilton
525ebe17e3 am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.
Merge commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp

* commit '389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
  Backport ParcelFileDescriptor.createPipe() from master.
2010-10-21 21:08:20 -07:00
James Dong
2418a4974f am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp

* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
  Turn the media time adjustment in file writer back on
2010-10-21 20:18:16 -07:00
Dianne Hackborn
5dcaf70eb3 am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
Merge commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488' into gingerbread-plus-aosp

* commit 'fdbb2168f7a9a202ee9406d65e7ef98a6745b488':
  Adjust boundaries for screen sizes.
2010-10-21 20:18:11 -07:00
Dianne Hackborn
3b7d0066bb am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp

* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
  Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE
2010-10-21 20:17:56 -07:00
Dianne Hackborn
d07349ee7f am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp

* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
  Fix issue #3117918: No way to finish a native activity
2010-10-21 20:17:50 -07:00
James Dong
33c44f267a Merge "Turn the media time adjustment in file writer back on" into gingerbread 2010-10-21 20:06:59 -07:00
Dianne Hackborn
12f3f83cec Merge "Adjust boundaries for screen sizes." into gingerbread 2010-10-21 19:21:28 -07:00
Dianne Hackborn
83a19d25f1 Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread 2010-10-21 19:20:49 -07:00
Dianne Hackborn
eab490ad03 Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread 2010-10-21 19:09:44 -07:00
Jeff Brown
37e376f2ed am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
Merge commit '6b3178a6323e015644590ebaee86523e4bb81773' into gingerbread-plus-aosp

* commit '6b3178a6323e015644590ebaee86523e4bb81773':
  Fix a race condition in wallpaper move throttling.
2010-10-21 18:05:53 -07:00
Jeff Brown
73d9935e2d Merge "Fix a race condition in wallpaper move throttling." into gingerbread 2010-10-21 18:02:54 -07:00
Dianne Hackborn
fcd9ecd064 am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp

* commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307':
  Fix issue #3117472: Format storage dialog still broken
2010-10-21 17:35:12 -07:00
Dianne Hackborn
9cd4354dda Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 2010-10-21 17:28:19 -07:00
Mathias Agopian
613493c424 am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Merge commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp

* commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685':
  fix [3119687] [Maps][4.6.0] Force close in street view
2010-10-21 17:07:15 -07:00
Mathias Agopian
878353fb0b Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread 2010-10-21 16:43:00 -07:00
Mathias Agopian
fb0163b8d0 am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp

* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
  Mirror the preview for front-facing cameras. do not merge
2010-10-21 16:26:02 -07:00
Kenny Root
bd3f24e7f1 am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES
Merge commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6' into gingerbread-plus-aosp

* commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6':
  Use correct size of GAMEPAD_KEYCODES
2010-10-21 16:22:58 -07:00
Mathias Agopian
c0f95207f4 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
Mathias Agopian
6af358e0a7 fix [3119687] [Maps][4.6.0] Force close in street view
The EGLConfig attributes MUST be sorted, because they're used in a binary search.
A recent change introduced a bug where 2 of the configs had improperly
sorted attributes.

Change-Id: I1ac53e4463d62f27125ca9f82ed946e6c98ddba0
2010-10-21 15:58:25 -07:00
Kenny Root
bc9c82fb79 Use correct size of GAMEPAD_KEYCODES
Compute the actual number of indices in the GAMEPAD_KEYCODES instead of
the pure size in bytes.

Bug: 3121536
Change-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466
2010-10-21 15:46:03 -07:00
Kenny Root
06dbe50a1a Initialized check in ZipFileRO::findEntryByName
If a ZipFileRO object is uninitialized, the hash table will not have
been initialized. This condition wasn't checked in findEntryByName.

Bug: 3121109
Change-Id: Ib696e0e7e0cb4dd0fb2e456d6a847e5e8f4fe14e
2010-10-21 15:25:12 -07:00
Chia-chi Yeh
82a3307a06 am 703aae06: Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread
Merge commit '703aae06c0925b19657877bb1872bb2f28874969' into gingerbread-plus-aosp

* commit '703aae06c0925b19657877bb1872bb2f28874969':
  RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
2010-10-21 12:57:03 -07:00
Chia-chi Yeh
e739a5257d Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread 2010-10-21 12:53:37 -07:00
Nick Kralevich
aa514a1570 am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
Merge commit '62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp

* commit '62d0970c82f9a2c17aea67379c207a3f17556c46':
  allow dumpstate to work for non-root users.
2010-10-21 11:50:55 -07:00
John Huang
4a60d1cddf am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp

* commit '7dc08fb070ff7455e794fc81645ccb4349cd152f':
  Fix connect duration for un-established SIP calls.
2010-10-21 11:46:55 -07:00
Nick Kralevich
6427fde659 Merge "allow dumpstate to work for non-root users." into gingerbread 2010-10-21 11:35:49 -07:00
John Huang
84adbf3770 Merge "Fix connect duration for un-established SIP calls." into gingerbread 2010-10-21 10:46:17 -07:00
Sylvain Fonteneau
c24ad3f9e5 am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.
Merge commit 'a71354d76689802152c33af257092d639c03c421' into gingerbread-plus-aosp

* commit 'a71354d76689802152c33af257092d639c03c421':
  Enable presence check at application level using
2010-10-21 09:38:49 -07:00
Nick Pelly
888ddb301c am 7ea5c45e: NFC settings cleanup.
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp

* commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
  NFC settings cleanup.
2010-10-21 09:38:15 -07:00
Brad Fitzpatrick
318e1fe73b am 15358e14: Merge "Make the base direction of the Arabic error pages RTL"
Merge commit '15358e145622df90942a444a63ae0006713b636d' into gingerbread-plus-aosp

* commit '15358e145622df90942a444a63ae0006713b636d':
  Make the base direction of the Arabic error pages RTL
2010-10-21 09:10:55 -07:00
Brad Fitzpatrick
f0ae78949d am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"
Merge commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b' into gingerbread-plus-aosp

* commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b':
  Set the base direction of the Hebrew error pages to RTL
2010-10-21 09:10:47 -07:00
Brad Fitzpatrick
3789789c8f Merge "Make the base direction of the Arabic error pages RTL" 2010-10-21 07:18:18 -07:00
Brad Fitzpatrick
d504db89b9 Merge "Set the base direction of the Hebrew error pages to RTL" 2010-10-21 07:18:02 -07:00
James Dong
17308c25c4 am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread
Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp

* commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
  File writer size estimation improvement
2010-10-20 21:28:38 -07:00
Mathias Agopian
483d824271 am 2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread
Merge commit '2b2da52608303b149d22418865e67c8030c70e73' into gingerbread-plus-aosp

* commit '2b2da52608303b149d22418865e67c8030c70e73':
  Add a test application to dump all the EGLConfig available
2010-10-20 21:28:34 -07:00
Mathias Agopian
23cafe75f4 am 73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread
Merge commit '73655bd2d303f8b3fe5c4bb0d8e4824361647381' into gingerbread-plus-aosp

* commit '73655bd2d303f8b3fe5c4bb0d8e4824361647381':
  propagate RS context priority to EGLContext when possible. DO NOT MERGE.
2010-10-20 21:28:29 -07:00
Mathias Agopian
db02bde788 am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread
Merge commit '583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp

* commit '583fefc8dcadecc7fc933513d3569dd9c16c100c':
  Use the context_priority extension when present.
2010-10-20 21:28:25 -07:00
James Dong
81b5fbfdac Merge "File writer size estimation improvement" into gingerbread 2010-10-20 20:07:57 -07:00
Mathias Agopian
a6da12c071 Merge "Add a test application to dump all the EGLConfig available" into gingerbread 2010-10-20 20:05:28 -07:00
Mathias Agopian
230fda781d Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread 2010-10-20 20:04:52 -07:00