OSDN Git Service
Romain Guy [Tue, 27 Sep 2011 23:44:28 +0000 (16:44 -0700)]
am
0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge.
* commit '
0e8fb15da2bd0912aa74ba6709dfe3d5b7c84fde':
CherryPick 043a6b from master: do not merge.
Jesse Wilson [Tue, 27 Sep 2011 23:31:10 +0000 (16:31 -0700)]
Merge "Test to demonstrate NPE in DefaultRequestDirector"
Xavier Ducrohet [Tue, 27 Sep 2011 22:47:55 +0000 (15:47 -0700)]
Merge "Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. Bug #
5352896"
Andreas Huber [Tue, 27 Sep 2011 22:26:43 +0000 (15:26 -0700)]
Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."
Peter Ng [Tue, 27 Sep 2011 22:07:39 +0000 (15:07 -0700)]
Merge "Lockscreen handle is now a locked icon and not an unlocked"
Eric Fischer [Tue, 27 Sep 2011 21:55:44 +0000 (14:55 -0700)]
am
ce9756d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
ce9756d06dd8aebb7b92879ab3b02bbe8f290992':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 27 Sep 2011 21:54:12 +0000 (14:54 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Scott Main [Tue, 27 Sep 2011 21:49:12 +0000 (14:49 -0700)]
Merge "docs: mix of BT and NFC javadoc updates Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links"
Jamie Gennis [Tue, 27 Sep 2011 21:24:09 +0000 (14:24 -0700)]
Merge changes Ib302d79e,Ib4ee085f
* changes:
SurfaceFlinger: set layer names on SurfaceTextures
SurfaceTexture: add name support
Eric Laurent [Tue, 27 Sep 2011 21:07:45 +0000 (14:07 -0700)]
Merge "Fix issue
5373658: memory leak in AudioFlinger."
Andreas Huber [Tue, 27 Sep 2011 20:36:22 +0000 (13:36 -0700)]
Merge "Signal an appropriate error even if there are no active streams yet."
Alon Albert [Tue, 27 Sep 2011 20:29:11 +0000 (13:29 -0700)]
Merge "Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:"
Daniel Sandler [Tue, 27 Sep 2011 20:08:54 +0000 (13:08 -0700)]
am
25bb73eb: Merge "Remove "excessive sync" icon." into ics-factoryrom
* commit '
25bb73eb1bc16921cc013b9b150c2d440d650c39':
Remove "excessive sync" icon.
Daniel Sandler [Tue, 27 Sep 2011 20:06:01 +0000 (13:06 -0700)]
Merge "Remove "excessive sync" icon." into ics-factoryrom
David 'Digit' Turner [Tue, 27 Sep 2011 19:36:15 +0000 (12:36 -0700)]
am
45c65741: am
be49703e: am
d51ecafa: opengl: Ensure we only load the GLES emulation library when the emulator supports it.
* commit '
45c657411774f900c79f6cb611bc1dc7887a1865':
opengl: Ensure we only load the GLES emulation library when the emulator supports it.
Jamie Gennis [Tue, 27 Sep 2011 19:32:17 +0000 (12:32 -0700)]
am
da42e0fa: Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
* commit '
da42e0faaa95c796dc49f3b38023562dab6584a7':
SurfaceFlinger: fix setting default buffer size
Jamie Gennis [Tue, 27 Sep 2011 19:28:59 +0000 (12:28 -0700)]
Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
Adam Powell [Tue, 27 Sep 2011 19:06:33 +0000 (12:06 -0700)]
Merge "Improve docs in BaseAdapter."
Tsu Chiang Chuang [Tue, 27 Sep 2011 18:18:13 +0000 (11:18 -0700)]
Merge "adding packet count and removing extra uid stats that were used for debugging."
Steve Block [Tue, 27 Sep 2011 17:52:50 +0000 (10:52 -0700)]
Merge changes If97c4d76,I1cd975b1
* changes:
Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
Eric Laurent [Tue, 27 Sep 2011 17:32:17 +0000 (10:32 -0700)]
Merge "Fix issue
5373048: AudioCache decode errors"
Peter Ng [Tue, 27 Sep 2011 17:24:54 +0000 (10:24 -0700)]
Merge "Fixed jaggy circles in pattern unlock"
The Android Open Source Project [Tue, 27 Sep 2011 17:10:44 +0000 (10:10 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I9c75782f72a7da6e1e9de183146841f8f4bebc6b
Justin Ho [Tue, 27 Sep 2011 16:56:25 +0000 (09:56 -0700)]
am
5fd141c2: Merge "Updated stat_sys icons" into ics-factoryrom
* commit '
5fd141c245051f2fa84bf2559a417577391e40df':
Updated stat_sys icons
Justin Ho [Tue, 27 Sep 2011 16:54:40 +0000 (09:54 -0700)]
Merge "Updated stat_sys icons" into ics-factoryrom
Daniel Sandler [Tue, 27 Sep 2011 16:23:05 +0000 (09:23 -0700)]
am
abff032e: Draw smaller system status icons without scaling.
* commit '
abff032e783398be7a1c6b7e1e25a73a8467adcf':
Draw smaller system status icons without scaling.
Teng-Hui Zhu [Tue, 27 Sep 2011 16:07:13 +0000 (09:07 -0700)]
Merge "Double check the permission before setting the Wake Lock"
The Android Automerger [Tue, 27 Sep 2011 10:52:49 +0000 (03:52 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Irfan Sheriff [Tue, 27 Sep 2011 05:11:03 +0000 (22:11 -0700)]
Merge "Switch to cfg based signal_poll command"
Scott Main [Tue, 27 Sep 2011 04:55:24 +0000 (21:55 -0700)]
Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5"
Jim Miller [Tue, 27 Sep 2011 03:40:59 +0000 (20:40 -0700)]
am
b4f0a9f3: Merge "Fix
5326463: rework sim state handling in lockscreen" into ics-factoryrom
* commit '
b4f0a9f3894c1f039168ad672f4aa194999c7cdd':
Fix
5326463: rework sim state handling in lockscreen
Christopher Tate [Tue, 27 Sep 2011 03:40:56 +0000 (20:40 -0700)]
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
Fabrice Di Meglio [Tue, 27 Sep 2011 03:40:54 +0000 (20:40 -0700)]
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
Mathias Agopian [Tue, 27 Sep 2011 03:40:50 +0000 (20:40 -0700)]
am
8632561e: Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom
* commit '
8632561e14c5cc546cec39edd213ea8cc7aea2f9':
Make the status and navigation bars OPAQUE.
Mathias Agopian [Tue, 27 Sep 2011 03:40:48 +0000 (20:40 -0700)]
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
Mathias Agopian [Tue, 27 Sep 2011 03:40:47 +0000 (20:40 -0700)]
am
a7969d91: Merge "Do not blend opaque windows." into ics-factoryrom
* commit '
a7969d91ad7547e5a83d54df835ca6820fef0927':
Do not blend opaque windows.
Mathias Agopian [Tue, 27 Sep 2011 03:40:46 +0000 (20:40 -0700)]
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.
Mathias Agopian [Tue, 27 Sep 2011 03:40:45 +0000 (20:40 -0700)]
am
04ba6d0e: (-s ours) Make sure Region handles invalid rectangles
* commit '
04ba6d0ebd6a750d2ab2794af5bc4a8406178f00':
Make sure Region handles invalid rectangles
Jamie Gennis [Tue, 27 Sep 2011 02:44:48 +0000 (19:44 -0700)]
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
Jamie Gennis [Tue, 27 Sep 2011 02:44:41 +0000 (19:44 -0700)]
am
3780d380: Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom
* commit '
3780d38010f50ccce508871058d54c1921936e0c':
SurfaceFlinger: fix the transform hint
Eric Fischer [Tue, 27 Sep 2011 02:44:28 +0000 (19:44 -0700)]
am
622abb73: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
622abb73a9fa8253679de1ac22bca66ab055eef8':
Import revised translations. DO NOT MERGE
Peter Ng [Tue, 27 Sep 2011 02:27:07 +0000 (19:27 -0700)]
Merge "Transparent lockscreen green indicator icons in a step to remove them fully from pattern unlock"
Jim Miller [Tue, 27 Sep 2011 01:41:01 +0000 (18:41 -0700)]
Merge "Fix
5326463: rework sim state handling in lockscreen" into ics-factoryrom
Jamie Gennis [Mon, 26 Sep 2011 23:54:44 +0000 (16:54 -0700)]
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
Chia-chi Yeh [Tue, 27 Sep 2011 00:29:38 +0000 (17:29 -0700)]
Merge "VpnDialogs: revise UI layout."
Christopher Tate [Tue, 27 Sep 2011 00:12:08 +0000 (17:12 -0700)]
Merge "Don't hang in restore if the transport reports failure" into ics-factoryrom
Christopher Tate [Tue, 27 Sep 2011 00:12:01 +0000 (17:12 -0700)]
Merge "Use the new INSTALL_FROM_ADB Package Manager flag..."
Peter Ng [Tue, 27 Sep 2011 00:02:06 +0000 (17:02 -0700)]
Merge "Vpn icon updated to a flat key and wifi updated to a two tone graphic"
Fabrice Di Meglio [Mon, 26 Sep 2011 23:58:35 +0000 (16:58 -0700)]
Merge "Bug
5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom
Mathias Agopian [Mon, 26 Sep 2011 23:19:26 +0000 (16:19 -0700)]
Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom
Mathias Agopian [Mon, 26 Sep 2011 23:19:04 +0000 (16:19 -0700)]
Merge "don't clear the framebuffer when the framebuffer is not used" into ics-factoryrom
Mathias Agopian [Mon, 26 Sep 2011 23:18:59 +0000 (16:18 -0700)]
Merge "Do not blend opaque windows." into ics-factoryrom
The Android Automerger [Mon, 26 Sep 2011 23:17:09 +0000 (16:17 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Mathias Agopian [Fri, 23 Sep 2011 03:57:04 +0000 (20:57 -0700)]
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
Romain Guy [Mon, 26 Sep 2011 23:13:01 +0000 (16:13 -0700)]
Merge "Do not blend opaque windows."
Mathias Agopian [Mon, 26 Sep 2011 23:10:08 +0000 (16:10 -0700)]
Merge "Region cannot handle malformed Rects. Abort the Region op in that case."
Mathias Agopian [Mon, 26 Sep 2011 22:58:20 +0000 (15:58 -0700)]
Region cannot handle malformed Rects. Abort the Region op in that case.
Bug:
5331198,
5334829
Change-Id: I05f2aaa95c55fe9e4a5d23180bb3032896c88151
Mathias Agopian [Mon, 19 Sep 2011 23:12:08 +0000 (16:12 -0700)]
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
Mathias Agopian [Mon, 26 Sep 2011 22:58:20 +0000 (15:58 -0700)]
Region cannot handle malformed Rects. Abort the Region op in that case.
Bug:
5331198,
5334829
Change-Id: Ib1fdbf6fb291e7f1191ccfe16b5ff29d73e7a474
Jamie Gennis [Mon, 26 Sep 2011 22:44:41 +0000 (15:44 -0700)]
Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" into ics-factoryrom
Jeff Sharkey [Mon, 26 Sep 2011 22:34:06 +0000 (15:34 -0700)]
Merge "Overlay to configure data usage network types."
Jamie Gennis [Mon, 26 Sep 2011 22:09:15 +0000 (15:09 -0700)]
Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom
Justin Ho [Mon, 26 Sep 2011 21:57:56 +0000 (14:57 -0700)]
Merge "Fixed alignment on home icon Bug:
5348452"
Eric Fischer [Mon, 26 Sep 2011 21:55:58 +0000 (14:55 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Chet Haase [Mon, 26 Sep 2011 21:46:19 +0000 (14:46 -0700)]
Merge "Fix display list issue that was crashing an external app."
Gilles Debunne [Mon, 26 Sep 2011 21:18:14 +0000 (14:18 -0700)]
Merge "Bug
5250788: TextView gets slower as the text length grows"
Daniel Sandler [Mon, 26 Sep 2011 19:39:01 +0000 (12:39 -0700)]
am
61b645ab: Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
* commit '
61b645ab86ace1511593f1f1f46dfb62bf0ae8b9':
Update all RSSIs whenever the connectivity changes.
Daniel Sandler [Mon, 26 Sep 2011 19:37:29 +0000 (12:37 -0700)]
Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
Fabrice Di Meglio [Mon, 26 Sep 2011 19:16:41 +0000 (12:16 -0700)]
Merge "Fix bug #
5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE"
Fabrice Di Meglio [Mon, 26 Sep 2011 19:16:30 +0000 (12:16 -0700)]
Merge "Fix bug #
5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak"
The Android Open Source Project [Mon, 26 Sep 2011 19:11:29 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8
Ben Komalo [Mon, 26 Sep 2011 19:02:19 +0000 (12:02 -0700)]
am
69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
* commit '
69a6d537e6f29683f685ecb688f0b06b1c0b2b15':
Enter minimal boot mode when booting encrypted
Ben Komalo [Mon, 26 Sep 2011 19:01:01 +0000 (12:01 -0700)]
Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
Jason Sams [Mon, 26 Sep 2011 18:57:41 +0000 (11:57 -0700)]
Merge "Remove unused fields in ProgramRaster"
Andreas Huber [Mon, 26 Sep 2011 18:26:59 +0000 (11:26 -0700)]
Merge "Properly connect to surface flinger in our shell tools"
Andreas Huber [Mon, 26 Sep 2011 18:03:05 +0000 (11:03 -0700)]
Merge "Propagate error signalled by the source all the way to the output EOS notification."
Gilles Debunne [Mon, 26 Sep 2011 17:38:58 +0000 (10:38 -0700)]
Merge "Bug
5248215: Even though I turned off the Spelling correction, it still shows up"
Wink Saville [Mon, 26 Sep 2011 17:27:16 +0000 (10:27 -0700)]
am
2783e1ce: Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
* commit '
2783e1ce7a9b2c82983223754228c06be6713a0f':
Remove unused persist.radio.imsregrequired.
Wink Saville [Mon, 26 Sep 2011 17:25:21 +0000 (10:25 -0700)]
Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
Kenny Root [Mon, 26 Sep 2011 16:53:06 +0000 (09:53 -0700)]
Merge "Allow non-required package verifiers"
Justin Ho [Mon, 26 Sep 2011 16:50:01 +0000 (09:50 -0700)]
am
48704d49: Updated key and effect sounds
* commit '
48704d4962f2120c62726eaa8bc6ec2d8a71071d':
Updated key and effect sounds
Steve Block [Mon, 26 Sep 2011 15:41:09 +0000 (08:41 -0700)]
Merge "Update the error for WebView thread violations to make clear that it's not fatal"
Andreas Huber [Mon, 26 Sep 2011 15:09:11 +0000 (08:09 -0700)]
Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
Ben Murdoch [Mon, 26 Sep 2011 13:19:56 +0000 (06:19 -0700)]
Merge "Force a WebView pictureset invalidation on screen rotation."
Brian Colonna [Mon, 26 Sep 2011 13:03:02 +0000 (06:03 -0700)]
Merge "FaceLock is now closed if emergency dial button is pressed"
Roman Nurik [Mon, 26 Sep 2011 07:16:40 +0000 (00:16 -0700)]
Merge "Update supported media formats doc for ICS"
Jeff Sharkey [Mon, 26 Sep 2011 06:44:10 +0000 (23:44 -0700)]
Merge "Watch network subtype, tethering teardown, empty."
Adam Powell [Sun, 25 Sep 2011 21:45:59 +0000 (14:45 -0700)]
Merge "Fix bug
5358705 - Request no full-screen mode of the IME when a SearchView is expanded in an action bar"
Bart Sears [Sun, 25 Sep 2011 21:32:14 +0000 (14:32 -0700)]
Merge "Revert "Transfer large bitmaps using ashmem. Bug:
5224703""
Bart Sears [Sun, 25 Sep 2011 21:30:21 +0000 (14:30 -0700)]
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
The Android Automerger [Sun, 25 Sep 2011 13:28:45 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Jeff Brown [Sun, 25 Sep 2011 03:49:20 +0000 (20:49 -0700)]
Merge "Transfer large bitmaps using ashmem. Bug:
5224703"
Brandon Keely [Sat, 24 Sep 2011 22:16:54 +0000 (15:16 -0700)]
Merge "Avoid double-ping when tapping outside the handle."
Jamie Gennis [Fri, 23 Sep 2011 22:54:34 +0000 (15:54 -0700)]
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
Jeff Brown [Sat, 24 Sep 2011 04:17:56 +0000 (21:17 -0700)]
Transfer large bitmaps using ashmem.
Bug:
5224703
Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
Jeff Brown [Sat, 24 Sep 2011 01:28:01 +0000 (18:28 -0700)]
Merge "Prevent unintended rotations. Bug:
4981385"
Adam Powell [Sat, 24 Sep 2011 01:16:22 +0000 (18:16 -0700)]
Merge "Fix bug
5355889 - Search action showing up in the menu dropdown in spite of search actionview being expanded"
Russell Brenner [Sat, 24 Sep 2011 00:40:31 +0000 (17:40 -0700)]
am
a6ccaa73: Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
* commit '
a6ccaa736d18d1ee375162e9df9d2aad8db869e5':
Replaced Lohit_Hindi with Lohit-Devanagari
Russell Brenner [Sat, 24 Sep 2011 00:38:10 +0000 (17:38 -0700)]
Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
Eric Fischer [Fri, 23 Sep 2011 22:46:56 +0000 (15:46 -0700)]
am
b8c78262: Merge "Mark MCC locale replacement strings not translatable." into ics-factoryrom
* commit '
b8c7826264816492ff91a27b1eb2d0d1454053e1':
Mark MCC locale replacement strings not translatable.