Brian Carlstrom
42ca4975dc
am 6f2adcf9: am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
...
* commit '6f2adcf9ab4a3dbe0b82bcdc3dd47de3eb975ebd':
Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
2013-03-05 00:56:05 +00:00
Jeff Sharkey
a096f24165
am 237940a0: (-s ours) am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
...
* commit '237940a0923ff7642cf2a043e65950297e91cf75':
Tighten enforcement of file modes.
2013-03-04 23:56:56 +00:00
Dave Burke
71f6426ac3
Merge "Add nullness check." into jb-mr2-dev
2013-03-04 23:33:26 +00:00
Dave Burke
c9b6be7c40
Add nullness check.
...
Bug: 8313121
Change-Id: Id2221e1c77eaf749ab4c4f6ec4cfa6684927c751
2013-03-04 15:20:42 -08:00
Nick Kralevich
0841c4cbdc
Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev
2013-03-04 22:40:17 +00:00
Irfan Sheriff
f9d3020c57
Merge "Clean up statemachine" into jb-mr2-dev
2013-03-04 22:38:30 +00:00
Christopher Tate
8edd78499e
Merge "DO NOT MERGE: Don't crash when we get a drag-ended after being detached" into jb-mr2-dev
2013-03-04 22:11:43 +00:00
Christopher Tate
267097b00b
DO NOT MERGE: Don't crash when we get a drag-ended after being detached
...
Removing view groups during a drag would cause an NPE here. The
child views will still get the drag-ended event as expected.
(Cherrypicked from downstream)
Bug 8298439
Change-Id: Ic14cbf9fdc305b91c1627f6882a45d34ee1c34ae
2013-03-04 14:02:29 -08:00
Romain Guy
e7d32b19b4
Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev
2013-03-04 21:49:16 +00:00
Romain Guy
19d4dd8599
Take text scale/skew into account only when rendering into a layer
...
3D rotations can undo scale/skew transforms; since FreeType only accepts
2x2 matrices we can end up generating very large glyphs that are drawn
at a 1:1 scale on screen. For instance, if the current transform has a
scale of 2000 set on both X and Y axis and a perspective Z factor set to
Z, the actual scale factor on screen ends up being 1. We would however
generate glyphs with a scale factor of 2000 causing the font renderer
to blow up.
Change-Id: Ia5c3618d36644e817825cb9c89e2f53aece2074e
2013-03-04 13:48:43 -08:00
Nick Kralevich
79619ddbfe
EntropyMixer: Write entropy at shutdown / reboot / power
...
Write out entropy if we're shutting down or rebooting,
or if someone plugs in the power.
Bug: 8312061
Change-Id: Id9a48064a7bdfe6c05a9227ea95a1bdbd0e9b8ae
2013-03-04 13:46:45 -08:00
Irfan Sheriff
fd7adc58ec
Clean up statemachine
...
- Remove a few unnecessary states. Driver is part of kernel for all devices.
- Clean up some logs
Change-Id: Id067bd944fcb01a279485b8fb3251c92a6894c55
2013-03-04 13:41:50 -08:00
Ben Murdoch
4c333e1772
Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev
2013-03-04 19:40:55 +00:00
Chris Craik
3e7dbf5373
Merge "Document that degenerate lines wont be drawn" into jb-mr2-dev
2013-03-04 18:58:19 +00:00
JP Abgrall
62f16bfc5e
jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
...
Missing iface8 in call to parseIfaceStats().
Bug: 8304054
Change-Id: Ibb01d86a0f7241cdd8f23401973840673f847efb
2013-03-04 18:53:07 +00:00
Brian Carlstrom
6f2adcf9ab
am b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
...
* commit 'b0cbf8607fb00a2bc54d15e01570cabf147fb5fb':
Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
2013-03-04 10:52:49 -08:00
Chris Craik
a5ef27da95
Document that degenerate lines wont be drawn
...
bug:7658830
Skia and the HW acceleration path don't render anything for degenerate
lines.
Change-Id: I5ea6fe8f16533e5045a7cd10475f4240f6c311b6
2013-03-04 10:41:55 -08:00
Irfan Sheriff
d2bfa3bdc0
Merge "Fix copy constructor" into jb-mr2-dev
2013-03-04 18:32:49 +00:00
Irfan Sheriff
90082124aa
Fix copy constructor
...
Bug: 8300712
Change-Id: If1c41a9fe35ca5950382ffcc5759fc14641d0b04
2013-03-04 10:28:42 -08:00
Brian Carlstrom
b0cbf8607f
Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
2013-03-04 17:50:14 +00:00
Derek Sollenberger
cdac497289
Deprecate read/write Pictures to streams.
...
bug: 8241089
Change-Id: I435a534f5110cb2b8aba87c047b509020a22fd67
2013-03-04 10:10:15 -05:00
Michael Jurka
7ac02bfb86
Merge "Fix RTL layout in Recent Apps, landscape mode" into jb-mr2-dev
2013-03-04 10:56:58 +00:00
Jeff Sharkey
2e0da1ea5f
Merge "Improve performance of storage measurement." into jb-mr2-dev
2013-03-02 06:14:51 +00:00
Romain Guy
151b71cb52
Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev
2013-03-02 02:08:18 +00:00
Romain Guy
874f5c6e4a
Fix math issue when transforming text in perspective
...
Change-Id: Iad6b4e477c11bd1ef5f0ceab2fabcd440030154d
2013-03-01 18:07:35 -08:00
Jeff Sharkey
237940a092
am 2048fbb1: am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
...
* commit '2048fbb1106a639c6b66298b94ab98eb4c650542':
Tighten enforcement of file modes.
2013-03-01 17:31:54 -08:00
Jeff Sharkey
2048fbb110
am c807070c: am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
...
* commit 'c807070cb54228f1039cd0a3f2fe14efbe46df3e':
Tighten enforcement of file modes.
2013-03-01 17:30:45 -08:00
Jeff Sharkey
c807070cb5
am 1e5e3748: am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
...
* commit '1e5e3748d4d431e48bd4b6a461ab3a9127beff7d':
Tighten enforcement of file modes.
2013-03-01 17:28:32 -08:00
Jeff Sharkey
1e5e3748d4
am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
...
* commit '67f2957331a63474879f68bf1a8d17b60b2188cd':
Tighten enforcement of file modes.
2013-03-01 17:26:07 -08:00
Jeff Sharkey
67f2957331
am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
...
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
Tighten enforcement of file modes.
2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4
am a2e929e1: Tighten enforcement of file modes.
...
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
Tighten enforcement of file modes.
2013-03-01 17:20:51 -08:00
Jeff Sharkey
63d0a06799
Improve performance of storage measurement.
...
When calculating directory sizes of data living on emulated external
storage, translate the path to use the internal backing data, which
avoids going through the emulation layer. It carefully retreats to
the original path when it runs into trouble.
Testing with a hierarchy of 10 directories deep and 2 directories
and 10 files wide at each level, this change improves performance
from 5900ms before to 250ms after; over 20 times faster (!).
Bug: 8172425
Change-Id: Ia7365416f091e102bf7345a49f7d7209a22580a9
2013-03-01 16:36:52 -08:00
Jeff Sharkey
a2e929e1df
Tighten enforcement of file modes.
...
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2013-03-01 16:17:09 -08:00
Romain Guy
28459117a7
Merge "Precache glyphs at final raster size" into jb-mr2-dev
2013-03-02 00:13:17 +00:00
Romain Guy
0f6675332c
Precache glyphs at final raster size
...
The deferred display lists model now allows us to precache glyphs
at their exact size on screen.
This change also removes debug markers when the renderer defers
and reorders display lists. It also adds a flush event marker.
Change-Id: I66ec5216dc12b93ecfdad52a7146b1cfb31fbeb4
2013-03-01 16:04:53 -08:00
Justin Koh
76f065d2e9
Merge "Add policy check to always show overflow menu button on TV devices." into jb-mr2-dev
2013-03-01 23:57:26 +00:00
Michael Wright
32440aa25d
Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev
2013-03-01 22:20:46 +00:00
Michael Wright
7dd5bb18d4
Unify inputDispatchingTimedOut with keyDispatchingTimedOut
...
Bug: 8194916
Change-Id: Iac40108d848bcca77f49a7a49c57a095b3dbe9c9
2013-03-01 14:14:35 -08:00
Selim Gurun
7be6d4c421
Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev
2013-03-01 21:46:42 +00:00
Selim Gurun
2bca22b2a5
Clarify the API documentation for WebSQL database.
...
Bug: 8231270
WebSQL database is disabled by default. And setting change to
enable it must precede the first url navigation. This change
is to clarify this behavior.
Change-Id: Ic0aab764821daece83f3482b30df4bebc7ff1f37
2013-03-01 13:35:12 -08:00
Jonathan Dixon
1001012808
Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev
2013-03-01 21:09:06 +00:00
Justin Koh
4207fda51b
Add policy check to always show overflow menu button on TV devices.
...
Add policy check to always show overflow menu button on TV devices.
Bug: 8236681
Change-Id: I4f92eef7a6d530feb698f83b0720b36115f7a04a
2013-03-01 13:03:20 -08:00
Dmitry Shmidt
a7f9b4e909
Merge "wifi: Add checking for scan results EOB" into jb-mr2-dev
2013-03-01 20:12:53 +00:00
Chris Craik
1da8a6a36d
Merge "Add shader program selection shortcut" into jb-mr2-dev
2013-03-01 19:42:38 +00:00
Scott Main
624de6854f
am 44e087bd: am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
...
* commit '44e087bdba93817f2031e20b0c189c548e1fef5d':
docs: add bdc's security doc as training article
2013-03-01 19:13:37 +00:00
Scott Main
44e087bdba
am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
...
* commit 'a3279494a451bac0c906d518a2c5a51934727db9':
docs: add bdc's security doc as training article
2013-03-01 11:11:52 -08:00
Chris Craik
096b8d96d5
Add shader program selection shortcut
...
Add a key manipulation that makes black text/paths use the standard
simple bitmap/patch shader, since they are the same. Previously we'd
create a separate shader for each because the keys differed, even
though the shaders were functionally equivalent.
Also fixes some issues around setting DEBUG_PROGRAM
Change-Id: I0c77c684d58da03501ee9ab8239c7d4a70fd6b5c
2013-03-01 11:11:31 -08:00
Scott Main
a3279494a4
am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
...
* commit '8d5b88463b37cc254ed8333506fc47bb1ec193bb':
docs: add bdc's security doc as training article
2013-03-01 11:09:14 -08:00
Scott Main
8d5b88463b
am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article
...
* commit '16bdd13ec7e64c04e1a17b94ffcb2a08f3b47518':
docs: add bdc's security doc as training article
2013-03-01 11:06:49 -08:00
Scott Main
16bdd13ec7
am 00158363: docs: add bdc\'s security doc as training article
...
* commit '00158363b47d916d159d2f3a0e1152783fd66a9c':
docs: add bdc's security doc as training article
2013-03-01 11:04:27 -08:00