Mathias Agopian
43b4c1e97b
Make sure Region handles invalid rectangles
...
the boolean operation code assumes rects are valid and
could go into an infinite loop if not. make sure we
abort before that happens.
Bug: 5331198, 5334829
Change-Id: I8aa42b2e0b37238ec2434b794dd84c1a1b70f163
2011-09-26 16:08:42 -07:00
Mathias Agopian
0857c8f7f1
Region cannot handle malformed Rects. Abort the Region op in that case.
...
Bug: 5331198, 5334829
Change-Id: Ib1fdbf6fb291e7f1191ccfe16b5ff29d73e7a474
2011-09-26 15:58:20 -07:00
Jamie Gennis
36d2c1f02c
Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" into ics-factoryrom
2011-09-26 15:44:41 -07:00
Jeff Sharkey
40b384b293
Merge "Overlay to configure data usage network types."
2011-09-26 15:34:06 -07:00
Jamie Gennis
87e6641d49
Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom
2011-09-26 15:09:15 -07:00
Justin Ho
35c41dd397
Merge "Fixed alignment on home icon Bug: 5348452"
2011-09-26 14:57:56 -07:00
Eric Fischer
24e7abef86
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-26 14:55:58 -07:00
Chet Haase
4f33ab422e
Merge "Fix display list issue that was crashing an external app."
2011-09-26 14:46:19 -07:00
Gilles Debunne
4cea637361
Merge "Bug 5250788: TextView gets slower as the text length grows"
2011-09-26 14:18:14 -07:00
Daniel Sandler
1098f105e5
am 61b645ab: Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
...
* commit '61b645ab86ace1511593f1f1f46dfb62bf0ae8b9':
Update all RSSIs whenever the connectivity changes.
2011-09-26 12:39:01 -07:00
Daniel Sandler
c4d3dfaa97
Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
2011-09-26 12:37:29 -07:00
Fabrice Di Meglio
6fe67dd8d8
Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE"
2011-09-26 12:16:41 -07:00
Fabrice Di Meglio
62f4feb9ca
Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak"
2011-09-26 12:16:30 -07:00
The Android Open Source Project
4c7d708d70
Reconcile with ics-factoryrom-release
...
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8
2011-09-26 12:11:29 -07:00
Ben Komalo
4748278047
am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
...
* commit '69a6d537e6f29683f685ecb688f0b06b1c0b2b15':
Enter minimal boot mode when booting encrypted
2011-09-26 12:02:19 -07:00
Ben Komalo
ee557f78b9
Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
2011-09-26 12:01:01 -07:00
Jason Sams
1ad7cc0b2b
Merge "Remove unused fields in ProgramRaster"
2011-09-26 11:57:41 -07:00
Andreas Huber
f2d8a37193
Merge "Properly connect to surface flinger in our shell tools"
2011-09-26 11:26:59 -07:00
Andreas Huber
fb3e044cca
Merge "Propagate error signalled by the source all the way to the output EOS notification."
2011-09-26 11:03:05 -07:00
Gilles Debunne
fe3a3afb70
Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up"
2011-09-26 10:38:58 -07:00
Wink Saville
e5c06166e9
am 2783e1ce: Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
...
* commit '2783e1ce7a9b2c82983223754228c06be6713a0f':
Remove unused persist.radio.imsregrequired.
2011-09-26 10:27:16 -07:00
Wink Saville
397c92dc01
Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
2011-09-26 10:25:21 -07:00
Kenny Root
1677362d1b
Merge "Allow non-required package verifiers"
2011-09-26 09:53:06 -07:00
Justin Ho
243c6f33dc
am 48704d49: Updated key and effect sounds
...
* commit '48704d4962f2120c62726eaa8bc6ec2d8a71071d':
Updated key and effect sounds
2011-09-26 09:50:01 -07:00
Steve Block
dcbb82a24e
Merge "Update the error for WebView thread violations to make clear that it's not fatal"
2011-09-26 08:41:09 -07:00
Andreas Huber
c42d1f4d0b
Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
2011-09-26 08:09:11 -07:00
Ben Murdoch
1f6293c35f
Merge "Force a WebView pictureset invalidation on screen rotation."
2011-09-26 06:19:56 -07:00
Brian Colonna
03d75aa97c
Merge "FaceLock is now closed if emergency dial button is pressed"
2011-09-26 06:03:02 -07:00
Roman Nurik
a7a78dd480
Merge "Update supported media formats doc for ICS"
2011-09-26 00:16:40 -07:00
Jeff Sharkey
2778b511f6
Merge "Watch network subtype, tethering teardown, empty."
2011-09-25 23:44:10 -07:00
Adam Powell
2a527aefe9
Merge "Fix bug 5358705 - Request no full-screen mode of the IME when a SearchView is expanded in an action bar"
2011-09-25 14:45:59 -07:00
Bart Sears
7c152d0742
Merge "Revert "Transfer large bitmaps using ashmem. Bug: 5224703""
2011-09-25 14:32:14 -07:00
Bart Sears
8acda78034
Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
...
This reverts commit 56c58f66b97d22fe7e7de1f7d9548bcbe1973029
This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
2011-09-25 14:30:21 -07:00
The Android Automerger
b8176f440e
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-25 06:28:45 -07:00
Jeff Brown
b94d5065d2
Merge "Transfer large bitmaps using ashmem. Bug: 5224703"
2011-09-24 20:49:20 -07:00
Brandon Keely
51d016345a
Merge "Avoid double-ping when tapping outside the handle."
2011-09-24 15:16:54 -07:00
Jamie Gennis
8d91b42507
SurfaceFlinger: fix the transform hint
...
This change fixes the transform hint to use only the global display
transform rather than incorporating the transient layer-specific
transform used during animations.
Bug: 5366891
Change-Id: I5408dcd3f4771d010953e8a696a484c835bfe81e
2011-09-24 11:27:20 -07:00
Jeff Brown
f4c1088d75
Transfer large bitmaps using ashmem.
...
Bug: 5224703
Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
2011-09-23 21:20:47 -07:00
Jeff Brown
5cecad7dc9
Merge "Prevent unintended rotations. Bug: 4981385"
2011-09-23 18:28:01 -07:00
Adam Powell
5dbf2640fa
Merge "Fix bug 5355889 - Search action showing up in the menu dropdown in spite of search actionview being expanded"
2011-09-23 18:16:22 -07:00
Russell Brenner
688b44de66
am a6ccaa73: Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
...
* commit 'a6ccaa736d18d1ee375162e9df9d2aad8db869e5':
Replaced Lohit_Hindi with Lohit-Devanagari
2011-09-23 17:40:31 -07:00
Russell Brenner
848b09071f
Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
2011-09-23 17:38:10 -07:00
Eric Fischer
72fa2193ec
am b8c78262: Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
...
* commit 'b8c7826264816492ff91a27b1eb2d0d1454053e1':
Mark MCC locale replacement strings not translatable.
2011-09-23 15:46:56 -07:00
Eric Fischer
673a6445f8
Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
2011-09-23 15:45:27 -07:00
Eric Fischer
ed0bb9bea2
am 90bf4765: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit '90bf47658855c2ab0d85933d2fc7925ec3de6bf4':
Import revised translations. DO NOT MERGE
2011-09-23 15:39:51 -07:00
Eric Fischer
250e4f6dc3
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-23 15:37:46 -07:00
Irfan Sheriff
85f1af8f1a
am c21994bc: Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
...
* commit 'c21994bc26df959d1a7161e38b4402b7255ea321':
Fix watchdog to stop ping after wifi disconnects
2011-09-23 15:20:56 -07:00
Irfan Sheriff
ceac65ebc8
Merge "Fix watchdog to stop ping after wifi disconnects" into ics-factoryrom
2011-09-23 15:18:37 -07:00
Fabrice Di Meglio
e0db82163c
Merge "Fix bug #5349461 TextView: text that ends with an ImageSpan causes line height to shrink to ImageSpan height"
2011-09-23 15:18:37 -07:00
Brian Colonna
d4a9a7adf0
Merge "Changed result of entering credentials after forgot pattern"
2011-09-23 15:09:15 -07:00