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
804de7daef
am 482284ad: am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
...
Merge commit '482284ad0e3226b49c27bf41442c1cb150853226'
* commit '482284ad0e3226b49c27bf41442c1cb150853226':
Fix a race condition in wallpaper move throttling.
2010-10-21 18:10:24 -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
b1bf683ff3
am 2f1eee34: am e9dbf208: Merge "Fix issue #3117472 : Format storage dialog still broken" into gingerbread
...
Merge commit '2f1eee34706cf42855541def5737c37a071d7293'
* commit '2f1eee34706cf42855541def5737c37a071d7293':
Fix issue #3117472 : Format storage dialog still broken
2010-10-21 17:44:40 -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
2e6153ee11
am 49af98ed: am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread
...
Merge commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7'
* commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7':
fix [3119687] [Maps][4.6.0] Force close in street view
2010-10-21 17:23:24 -07:00
Mathias Agopian
50efa3bc4c
am 46beb433: (-s ours) am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
...
Merge commit '46beb43357e32507189203db4626d0df954abe62'
* commit '46beb43357e32507189203db4626d0df954abe62':
Mirror the preview for front-facing cameras. do not merge
2010-10-21 17:22:05 -07:00
Kenny Root
a209aa866e
am d7cd560a: am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES
...
Merge commit 'd7cd560af506f75d07034c136bea09b409b4d408'
* commit 'd7cd560af506f75d07034c136bea09b409b4d408':
Use correct size of GAMEPAD_KEYCODES
2010-10-21 17:21:56 -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
Chia-chi Yeh
1e207d67fb
am 044fcd64: am 703aae06: Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread
...
Merge commit '044fcd64fe999dca0f986dfce9cb3b5b1da77f44'
* commit '044fcd64fe999dca0f986dfce9cb3b5b1da77f44':
RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
2010-10-21 16:08:47 -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
Nick Kralevich
dcb4191350
am 9a430d8c: am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
...
Merge commit '9a430d8c0e376160f287e50cdad99177e69ec384'
* commit '9a430d8c0e376160f287e50cdad99177e69ec384':
allow dumpstate to work for non-root users.
2010-10-21 15:31:07 -07:00
John Huang
437a550f53
am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
...
Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c'
* commit '33051ad1785a84ad5d814d6acf337b54d5fab36c':
Fix connect duration for un-established SIP calls.
2010-10-21 15:29:48 -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
Marc Blank
64408a3878
Merge "Don't stop FlingRunnable when deltaY is rounded to zero"
2010-10-21 15:01:13 -07:00
Chris Tate
5fe5e871e1
Merge "Report drag success/fail in the DRAG_ENDED message"
2010-10-21 14:46:18 -07:00
Shimeng (Simon) Wang
7dd0be662c
Merge "Let restored scale be in effect."
2010-10-21 14:40:56 -07:00
Sylvain Fonteneau
82503c3172
am 4fc9ecf2: am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.
...
Merge commit '4fc9ecf223895f09b5593d4bcd2a3f0e2d1f0bae'
* commit '4fc9ecf223895f09b5593d4bcd2a3f0e2d1f0bae':
Enable presence check at application level using
2010-10-21 13:50:20 -07:00
Nick Pelly
2a734d952c
am c0e93a84: am 7ea5c45e: NFC settings cleanup.
...
Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a'
* commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a':
NFC settings cleanup.
2010-10-21 13:50:09 -07:00
Brad Fitzpatrick
8112eeee4f
am 0c551368: am 15358e14: Merge "Make the base direction of the Arabic error pages RTL"
...
Merge commit '0c55136893849d72ac267f887a841efe845218a1'
* commit '0c55136893849d72ac267f887a841efe845218a1':
Make the base direction of the Arabic error pages RTL
2010-10-21 13:49:41 -07:00
Brad Fitzpatrick
573a08bb65
am ba1b1c9c: am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"
...
Merge commit 'ba1b1c9c22373737b1ba50a6847b1fbe33999179'
* commit 'ba1b1c9c22373737b1ba50a6847b1fbe33999179':
Set the base direction of the Hebrew error pages to RTL
2010-10-21 13:49:35 -07:00
James Dong
ee29fef233
am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread
...
Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99'
* commit '8ad6335d2c22900de5b46460473495b5bcea9f99':
File writer size estimation improvement
2010-10-21 13:49:00 -07:00
Mathias Agopian
e3c5974719
am 63ac8f53: am 2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread
...
Merge commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea'
* commit '63ac8f5377833303a7f8c4d60f0d74daf903e6ea':
Add a test application to dump all the EGLConfig available
2010-10-21 13:48:50 -07:00
Mathias Agopian
3abb297690
am 4ceee5a6: (-s ours) am 73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread
...
Merge commit '4ceee5a6b0089ffbec75690b7284f80d481ab212'
* commit '4ceee5a6b0089ffbec75690b7284f80d481ab212':
propagate RS context priority to EGLContext when possible. DO NOT MERGE.
2010-10-21 13:48:42 -07:00
Mathias Agopian
47a79466a7
am fb31036f: am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread
...
Merge commit 'fb31036fd844444c395a2ae9c97439eec9f774e4'
* commit 'fb31036fd844444c395a2ae9c97439eec9f774e4':
Use the context_priority extension when present.
2010-10-21 13:48:36 -07:00
Mathias Agopian
f6715ba6de
am 6d90e89a: am a0795fc9: Merge "software renderer: fix [3117351] GL driver doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread
...
Merge commit '6d90e89afa47293cf5fe18f512cce43d2fa6df82'
* commit '6d90e89afa47293cf5fe18f512cce43d2fa6df82':
software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
2010-10-21 13:47:59 -07:00
Jean-Baptiste Queru
d6d2886f08
am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp
...
Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342'
* commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342':
Make disabled TextViews uneditable
2010-10-21 13:47:42 -07:00
Dianne Hackborn
a98b46e181
am 674b856c: am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
...
Merge commit '674b856c15206a23d9d8a22fbd936a4f3055894d'
* commit '674b856c15206a23d9d8a22fbd936a4f3055894d':
Fix java doc on FLAG_EXTERNAL.
2010-10-21 13:47:08 -07:00
Jean-Baptiste Queru
f46ea1d2b4
am c20f205d: am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"
...
Merge commit 'c20f205d1059ff71b21d9c44ea147e209c364d2f'
* commit 'c20f205d1059ff71b21d9c44ea147e209c364d2f':
BatteryService: Set bool to true if sysfs entry is not 0
2010-10-21 13:46:41 -07:00
Jean-Baptiste Queru
42a9fb6105
am eceace47: am 81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
...
Merge commit 'eceace47c575d15a3d4b7cd511c20f86850bf301'
* commit 'eceace47c575d15a3d4b7cd511c20f86850bf301':
Fix FastScroller overlay position bug
2010-10-21 13:46:24 -07:00
Kenny Root
1470a09b01
am c9259447: am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread
...
Merge commit 'c925944733207b83aaa81cf7a92c38eb48443470'
* commit 'c925944733207b83aaa81cf7a92c38eb48443470':
Fix isUsbMassStorageConnected() will always return true
2010-10-21 13:44:55 -07:00
Dianne Hackborn
cf6b318f2b
am 153bf6c8: am e9e23405: Merge "Fix issue #3113424 : Battery stats don\'t reset on Crespo" into gingerbread
...
Merge commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4'
* commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4':
Fix issue #3113424 : Battery stats don't reset on Crespo
2010-10-21 13:44:47 -07:00
Justin Ho
d7b1c0c4b9
am a747b439: (-s ours) am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread
...
Merge commit 'a747b4399300beae712dacdf189f10e91b3623a0'
* commit 'a747b4399300beae712dacdf189f10e91b3623a0':
DO NOT MERGE - Updated media playback transport controls (b/3116268)
2010-10-21 13:44:16 -07:00
Hung-ying Tyan
5a6d2934c9
am bdc15d8b: am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
...
Merge commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625'
* commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625':
Add permission requirements to SipAudioCall and SipManager javadoc.
2010-10-21 13:44:06 -07:00
Hung-ying Tyan
688fc1a102
am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone.
...
Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8'
* commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8':
Fix n-way conf call in SipPhone.
2010-10-21 13:43:43 -07:00
Chet Haase
5a2d8bd382
Merge "Optimizing display lists by referencing pointers to resources instead of copying them"
2010-10-21 13:29:26 -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
Daniel Sandler
351c1f60df
Merge "New system bar "shirt pocket", for quickly stashing draggable bits."
2010-10-21 12:24:12 -07:00
Joe Onorato
8ffb20a2cb
Merge "Don't remove items from mRecords while iterating over it."
2010-10-21 12:00:33 -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