Teng-Hui Zhu
4771fb3a86
Merge "Double check the permission before setting the Wake Lock"
2011-09-27 09:07:13 -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
Irfan Sheriff
ae5b91c679
Merge "Switch to cfg based signal_poll command"
2011-09-26 22:11:03 -07:00
Scott Main
7f5520be41
Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5"
2011-09-26 21:55:24 -07:00
Jim Miller
23b2ef6864
am b4f0a9f3: Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom
...
* commit 'b4f0a9f3894c1f039168ad672f4aa194999c7cdd':
Fix 5326463: rework sim state handling in lockscreen
2011-09-26 20:40:59 -07:00
Christopher Tate
6d1e9efcde
am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" into ics-factoryrom
...
* commit '7462251b0a3f2601236b599bcabf54451143b704':
Don't hang in restore if the transport reports failure
2011-09-26 20:40:56 -07:00
Fabrice Di Meglio
f5c89e2af2
am a200a23a: Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom
...
* commit 'a200a23af10dfcbbe46d10e868c2eae9f2c794a4':
Bug 5332065: IOOB in case the suggestionSpan has been removed
2011-09-26 20:40:54 -07:00
Mathias Agopian
5dfe70df37
am 8632561e: Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom
...
* commit '8632561e14c5cc546cec39edd213ea8cc7aea2f9':
Make the status and navigation bars OPAQUE.
2011-09-26 20:40:50 -07:00
Mathias Agopian
2634dac75c
am a2a3f1e7: Merge "don\'t clear the framebuffer when the framebuffer is not used" into ics-factoryrom
...
* commit 'a2a3f1e7e6a31f1109a3c25a48c33d3d67cb1adc':
don't clear the framebuffer when the framebuffer is not used
2011-09-26 20:40:48 -07:00
Mathias Agopian
e693beecf8
am a7969d91: Merge "Do not blend opaque windows." into ics-factoryrom
...
* commit 'a7969d91ad7547e5a83d54df835ca6820fef0927':
Do not blend opaque windows.
2011-09-26 20:40:47 -07:00
Mathias Agopian
f22710b394
am 781fea80: Region cannot handle malformed Rects. Abort the Region op in that case.
...
* commit '781fea802b6b1c2e33a35dfe24c6ec29ed73a9c2':
Region cannot handle malformed Rects. Abort the Region op in that case.
2011-09-26 20:40:46 -07:00
Mathias Agopian
5f5b9173a7
am 04ba6d0e: (-s ours) Make sure Region handles invalid rectangles
...
* commit '04ba6d0ebd6a750d2ab2794af5bc4a8406178f00':
Make sure Region handles invalid rectangles
2011-09-26 20:40:45 -07:00
Jamie Gennis
10fbe5d6bb
am 892ac415: (-s ours) Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" into ics-factoryrom
...
* commit '892ac4155a7e2f2c824ee9898d4c5cef4bbe1afc':
(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip
2011-09-26 19:44:48 -07:00
Jamie Gennis
9a375927a5
am 3780d380: Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom
...
* commit '3780d38010f50ccce508871058d54c1921936e0c':
SurfaceFlinger: fix the transform hint
2011-09-26 19:44:41 -07:00
Eric Fischer
d6dabef86b
am 622abb73: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit '622abb73a9fa8253679de1ac22bca66ab055eef8':
Import revised translations. DO NOT MERGE
2011-09-26 19:44:28 -07:00
Peter Ng
40cb65de17
Merge "Transparent lockscreen green indicator icons in a step to remove them fully from pattern unlock"
2011-09-26 19:27:07 -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
Chia-chi Yeh
c82058f756
Merge "VpnDialogs: revise UI layout."
2011-09-26 17:29:38 -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
Christopher Tate
3bc590f531
Merge "Use the new INSTALL_FROM_ADB Package Manager flag..."
2011-09-26 17:12:01 -07:00
Peter Ng
e716603dc5
Merge "Vpn icon updated to a flat key and wifi updated to a two tone graphic"
2011-09-26 17:02:06 -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
Romain Guy
bdbfe03555
Merge "Do not blend opaque windows."
2011-09-26 16:13:01 -07:00
Mathias Agopian
e488c209c4
Merge "Region cannot handle malformed Rects. Abort the Region op in that case."
2011-09-26 16:10:08 -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
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