The Android Automerger
1bc0ac0d8a
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-03 14:53:50 -07:00
The Android Automerger
474c1e1ae5
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-30 13:12:46 -07:00
The Android Automerger
765d62cf9c
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 18:46:30 -07:00
Mathias Agopian
f940a3b4c1
Merge "improve hwc log output" into ics-factoryrom
2011-09-29 18:34:22 -07:00
Mathias Agopian
7bc371924e
improve hwc log output
...
we now print the handle of each buffer
Change-Id: I4104cd6d3a0a303baf44c5c69de3bf36c237892e
2011-09-29 18:12:20 -07:00
The Android Automerger
02b9ba3607
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 15:21:22 -07:00
The Android Automerger
c4d102b1d6
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 06:29:20 -07:00
Eric Fischer
f23300b042
Merge "Import revised translations." into ics-factoryrom
2011-09-28 17:35:18 -07:00
The Android Automerger
750fd30919
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-28 17:34:28 -07:00
Eric Fischer
89f653b9ca
Merge "Don't lose product variant strings that also vary between locales." into ics-factoryrom
2011-09-28 17:01:39 -07:00
Eric Fischer
1e4c600e6d
Merge "Import revised translations. DO NOT MERGE." into ics-factoryrom
2011-09-28 16:55:33 -07:00
Justin Ho
58bd71095f
Merge "Updated menu icon Bug: 5388009" into ics-factoryrom
2011-09-28 15:24:09 -07:00
Justin Ho
b917577a94
Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryrom
2011-09-28 15:23:57 -07:00
Xia Wang
6414d0bff1
Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom
2011-09-28 12:38:15 -07:00
Fred Quintana
ec0350cdd2
Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom
2011-09-28 11:45:52 -07:00
The Android Automerger
45e32f9012
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-28 06:09:16 -07:00
Eric Fischer
a3cc6e758c
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-27 14:54:12 -07:00
The Android Automerger
5322146952
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-27 13:32:06 -07:00
Daniel Sandler
3153a1ca9d
Merge "Remove "excessive sync" icon." into ics-factoryrom
2011-09-27 13:06:01 -07:00
Jamie Gennis
1b5f4e61ff
Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
2011-09-27 12:28:59 -07:00
Justin Ho
b454e0bb97
Merge "Updated stat_sys icons" into ics-factoryrom
2011-09-27 09:54:40 -07:00
The Android Automerger
5a6325d512
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-27 03:52:49 -07:00
Jim Miller
a18d169c46
Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom
2011-09-26 18:41:01 -07:00
Jamie Gennis
2a0d5b6084
SurfaceFlinger: fix setting default buffer size
...
This change makes SurfaceFlinger update a SurfaceTextureLayer's default
buffer size in response to a window resize even if the Layer is in fixed
size mode.
Change-Id: I3871c8f19a045d03904d1284390cad7659be71ff
Bug: 5366426
2011-09-26 18:38:52 -07:00
Christopher Tate
90236762b9
Merge "Don't hang in restore if the transport reports failure" into ics-factoryrom
2011-09-26 17:12:08 -07:00
Fabrice Di Meglio
24101a0b9c
Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom
2011-09-26 16:58:35 -07:00
Mathias Agopian
0270c8cbf2
Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom
2011-09-26 16:19:26 -07:00
Mathias Agopian
4924e61d03
Merge "don't clear the framebuffer when the framebuffer is not used" into ics-factoryrom
2011-09-26 16:19:04 -07:00
Mathias Agopian
71042c0c4e
Merge "Do not blend opaque windows." into ics-factoryrom
2011-09-26 16:18:59 -07:00
The Android Automerger
c6ce130bdf
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-26 16:17:09 -07:00
Mathias Agopian
4801404dcb
don't clear the framebuffer when the framebuffer is not used
...
when areas of the FB are undefined (transparent windows on top of
nothing), we clear those areas before composition.
however, it makes no sense to do this when the FB is not in use
(case where hwc handles all layers)
Bug: 5360529
Change-Id: I761a7d3664228ebbee0944aca8b0cc278fc94c9c
2011-09-26 16:14:05 -07:00
Mathias Agopian
a970cabc5c
Region cannot handle malformed Rects. Abort the Region op in that case.
...
Bug: 5331198, 5334829
Change-Id: I05f2aaa95c55fe9e4a5d23180bb3032896c88151
2011-09-26 16:08:52 -07:00
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
Jamie Gennis
36d2c1f02c
Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" into ics-factoryrom
2011-09-26 15:44:41 -07:00
Jamie Gennis
87e6641d49
Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom
2011-09-26 15:09:15 -07:00
Eric Fischer
24e7abef86
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-26 14:55:58 -07:00
Daniel Sandler
c4d3dfaa97
Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
2011-09-26 12:37:29 -07:00
Ben Komalo
ee557f78b9
Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
2011-09-26 12:01:01 -07:00
Wink Saville
397c92dc01
Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
2011-09-26 10:25: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
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
Russell Brenner
848b09071f
Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
2011-09-23 17:38:10 -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
250e4f6dc3
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-23 15:37:46 -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
Christopher Tate
367dedc53e
Merge "Don't crash during full backup when CheckJNI is enabled" into ics-factoryrom
2011-09-23 13:19:33 -07:00
The Android Automerger
226d21b41d
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-23 11:35:01 -07:00
Wei Huang
929e551f6c
Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
2011-09-23 10:04:02 -07:00
Eric Fischer
abb909024c
Merge "Delete translations of files that no longer exist." into ics-factoryrom
2011-09-23 09:43:55 -07:00
Pannag Sanketi
f42489003e
Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
2011-09-23 09:06:55 -07:00
