OSDN Git Service
Marco Nelissen [Tue, 5 Mar 2013 05:45:02 +0000 (05:45 +0000)]
am
8c6b3b93: am
daa95754: am
056c610c: am
b6a2978a: Merge "Performance increase in thumbnail handling"
* commit '
8c6b3b93e2ebe8db06165f6378d86cac2c606171':
Performance increase in thumbnail handling
Marco Nelissen [Tue, 5 Mar 2013 05:42:37 +0000 (05:42 +0000)]
am
daa95754: am
056c610c: am
b6a2978a: Merge "Performance increase in thumbnail handling"
* commit '
daa95754a53a9f90c4afaa4eccdc25f08fd2d264':
Performance increase in thumbnail handling
Marco Nelissen [Tue, 5 Mar 2013 05:40:40 +0000 (05:40 +0000)]
am
056c610c: am
b6a2978a: Merge "Performance increase in thumbnail handling"
* commit '
056c610c9ba83fbf68e15fa4557620dc7820f087':
Performance increase in thumbnail handling
Craig Mautner [Tue, 5 Mar 2013 03:34:48 +0000 (03:34 +0000)]
Merge "Convert mHistory to mTaskHistory (9)"
Romain Guy [Tue, 5 Mar 2013 03:15:37 +0000 (03:15 +0000)]
am
370929f4: am
d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #
8297260" into jb-mr2-dev
* commit '
370929f4bf6b9d7a196eae531f38cdec19140dfd':
Finish current Canvas operations then resume previous Canvas Bug #
8297260
Romain Guy [Tue, 5 Mar 2013 03:14:14 +0000 (03:14 +0000)]
am
d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #
8297260" into jb-mr2-dev
* commit '
d23b2747eff9ae3203f96039794068e9f1b0c71b':
Finish current Canvas operations then resume previous Canvas Bug #
8297260
Romain Guy [Tue, 5 Mar 2013 03:11:10 +0000 (03:11 +0000)]
Merge "Finish current Canvas operations then resume previous Canvas Bug #
8297260" into jb-mr2-dev
Romain Guy [Tue, 5 Mar 2013 03:08:02 +0000 (19:08 -0800)]
Finish current Canvas operations then resume previous Canvas
Bug #
8297260
Change-Id: Ia30bb61ff5db805ec5d57f5e4c22c275f649ecdb
Mathias Agopian [Tue, 5 Mar 2013 02:37:43 +0000 (02:37 +0000)]
am
e94fcd6c: am
188f8c5e: Merge "screenshots can now go into a Surface from java" into jb-mr2-dev
* commit '
e94fcd6c494931afc1d7f70138db01de37cdb9fc':
screenshots can now go into a Surface from java
Mathias Agopian [Tue, 5 Mar 2013 02:35:07 +0000 (02:35 +0000)]
am
188f8c5e: Merge "screenshots can now go into a Surface from java" into jb-mr2-dev
* commit '
188f8c5e4b266429b07b4381d58d33b1e771be48':
screenshots can now go into a Surface from java
Mathias Agopian [Tue, 5 Mar 2013 02:31:15 +0000 (02:31 +0000)]
Merge "screenshots can now go into a Surface from java" into jb-mr2-dev
Romain Guy [Tue, 5 Mar 2013 02:04:03 +0000 (02:04 +0000)]
am
e8915696: am
836f93dc: Merge "Never resize a Bitmap down to 0 at load time Bug #
8313929" into jb-mr2-dev
* commit '
e89156968dc917dfbae2f3965513f3cee73b9355':
Never resize a Bitmap down to 0 at load time Bug #
8313929
Romain Guy [Tue, 5 Mar 2013 02:02:03 +0000 (02:02 +0000)]
am
836f93dc: Merge "Never resize a Bitmap down to 0 at load time Bug #
8313929" into jb-mr2-dev
* commit '
836f93dc5f00536baa56f7c035c424a130f9c2a3':
Never resize a Bitmap down to 0 at load time Bug #
8313929
Romain Guy [Tue, 5 Mar 2013 01:57:26 +0000 (01:57 +0000)]
Merge "Never resize a Bitmap down to 0 at load time Bug #
8313929" into jb-mr2-dev
Romain Guy [Tue, 5 Mar 2013 01:55:55 +0000 (17:55 -0800)]
Never resize a Bitmap down to 0 at load time
Bug #
8313929
Change-Id: Ic9b691319f162228c72ad1afed4dfe0b4181c422
Mathias Agopian [Sat, 2 Mar 2013 07:01:51 +0000 (23:01 -0800)]
screenshots can now go into a Surface from java
A Surface can trivially be created from a SurfaceTexture.
Update ElectronBeam to use this new API.
Bug:
6940974
Change-Id: I20459443d0d853e3f8ae23104c08d185c336abea
Craig Mautner [Fri, 1 Mar 2013 06:37:44 +0000 (22:37 -0800)]
Convert mHistory to mTaskHistory (9)
- Convert startActivityLocked from mHistory to mTaskHistory.
- Fix NPE bug in resetTaskIfNeededLocked.
Change-Id: I1598446199634bb455bc06377248fe940d5cb9d4
Brian Carlstrom [Tue, 5 Mar 2013 01:02:41 +0000 (01:02 +0000)]
am
31167ffb: am
42ca4975: am
6f2adcf9: am
b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
* commit '
31167ffb2def7461edbac9b8c35366bb6a0e5881':
Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
Brian Carlstrom [Tue, 5 Mar 2013 01:00:06 +0000 (01:00 +0000)]
am
42ca4975: am
6f2adcf9: am
b0cbf860: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
* commit '
42ca4975dc6ec2c206f8e7e883e1d0d549b44c95':
Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
Brian Carlstrom [Tue, 5 Mar 2013 00:56:05 +0000 (00:56 +0000)]
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
Marco Nelissen [Tue, 5 Mar 2013 00:31:26 +0000 (16:31 -0800)]
am
b6a2978a: Merge "Performance increase in thumbnail handling"
* commit '
b6a2978a5118d66bcebc380b0c20e566b7cbdfda':
Performance increase in thumbnail handling
Marco Nelissen [Tue, 5 Mar 2013 00:06:33 +0000 (00:06 +0000)]
Merge "Performance increase in thumbnail handling"
Jeff Sharkey [Tue, 5 Mar 2013 00:03:07 +0000 (00:03 +0000)]
am
cab82015: am
a096f241: am
237940a0: (-s ours) am
2048fbb1: am
c807070c: am
1e5e3748: am
67f29573: am
bb2aa63b: am
a2e929e1: Tighten enforcement of file modes.
* commit '
cab8201526cd25054c0c54bc865aa95d5808d690':
Tighten enforcement of file modes.
Jeff Sharkey [Tue, 5 Mar 2013 00:01:37 +0000 (00:01 +0000)]
am
a096f241: am
237940a0: (-s ours) am
2048fbb1: am
c807070c: am
1e5e3748: am
67f29573: am
bb2aa63b: am
a2e929e1: Tighten enforcement of file modes.
* commit '
a096f241657eec46c1202f9194907efb7073e247':
Tighten enforcement of file modes.
Philip Milne [Tue, 5 Mar 2013 00:00:12 +0000 (00:00 +0000)]
Merge "Optical Bounds: clear inherited layoutModes when layoutMode of root layout is set to a new value."
Jeff Sharkey [Mon, 4 Mar 2013 23:56:56 +0000 (23:56 +0000)]
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.
Philip Milne [Wed, 27 Feb 2013 19:15:21 +0000 (11:15 -0800)]
Optical Bounds: clear inherited layoutModes when layoutMode of root layout is set to a new value.
This is an addendum to:
https://googleplex-android-review.googlesource.com/#/c/246507
Change-Id: Ia9d6fdfe7fdb76c1152466315ff3b1c42c077ee2
Dave Burke [Mon, 4 Mar 2013 23:39:53 +0000 (23:39 +0000)]
am
1976dd91: am
71f6426a: Merge "Add nullness check." into jb-mr2-dev
* commit '
1976dd91edf6823f7ea5d42ae3ea48eb8f425cf5':
Add nullness check.
Dave Burke [Mon, 4 Mar 2013 23:37:48 +0000 (23:37 +0000)]
am
71f6426a: Merge "Add nullness check." into jb-mr2-dev
* commit '
71f6426ac3787f22a0078ed42dbf8f568eebf2f8':
Add nullness check.
Dave Burke [Mon, 4 Mar 2013 23:33:26 +0000 (23:33 +0000)]
Merge "Add nullness check." into jb-mr2-dev
Dave Burke [Mon, 4 Mar 2013 23:20:42 +0000 (15:20 -0800)]
Add nullness check.
Bug:
8313121
Change-Id: Id2221e1c77eaf749ab4c4f6ec4cfa6684927c751
Nick Kralevich [Mon, 4 Mar 2013 22:45:44 +0000 (22:45 +0000)]
am
0e5b5f66: am
0841c4cb: Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev
* commit '
0e5b5f6619f45db6cdff7757d208c197a3d4a3b1':
EntropyMixer: Write entropy at shutdown / reboot / power
Nick Kralevich [Mon, 4 Mar 2013 22:44:03 +0000 (22:44 +0000)]
am
0841c4cb: Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev
* commit '
0841c4cbdcedd32bfea4126d17876c6c892875e8':
EntropyMixer: Write entropy at shutdown / reboot / power
Irfan Sheriff [Mon, 4 Mar 2013 22:42:10 +0000 (22:42 +0000)]
am
bfadb84f: am
f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev
* commit '
bfadb84f9d44ee2f74db394cec431059201b0086':
Clean up statemachine
Irfan Sheriff [Mon, 4 Mar 2013 22:40:35 +0000 (22:40 +0000)]
am
f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev
* commit '
f9d3020c575fd20097f599dc336a3b448415b7d7':
Clean up statemachine
Nick Kralevich [Mon, 4 Mar 2013 22:39:29 +0000 (22:39 +0000)]
Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev
Irfan Sheriff [Mon, 4 Mar 2013 22:38:30 +0000 (22:38 +0000)]
Merge "Clean up statemachine" into jb-mr2-dev
Christopher Tate [Mon, 4 Mar 2013 22:18:14 +0000 (22:18 +0000)]
am
f9ed8be1: (-s ours) am
8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev
* commit '
f9ed8be17da47f5003205bf1fbfc87a300de10f0':
DO NOT MERGE: Don't crash when we get a drag-ended after being detached
Christopher Tate [Mon, 4 Mar 2013 22:13:33 +0000 (22:13 +0000)]
am
8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev
* commit '
8edd78499e2656916e89eeae91aa0f023f69eddc':
DO NOT MERGE: Don't crash when we get a drag-ended after being detached
Christopher Tate [Mon, 4 Mar 2013 22:11:43 +0000 (22:11 +0000)]
Merge "DO NOT MERGE: Don't crash when we get a drag-ended after being detached" into jb-mr2-dev
Christopher Tate [Mon, 4 Mar 2013 20:57:23 +0000 (12:57 -0800)]
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
Romain Guy [Mon, 4 Mar 2013 21:55:43 +0000 (21:55 +0000)]
am
f2f3988e: am
e7d32b19: Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev
* commit '
f2f3988ecba293e88a661bfe0a5bbd76de79224a':
Take text scale/skew into account only when rendering into a layer
Romain Guy [Mon, 4 Mar 2013 21:53:42 +0000 (21:53 +0000)]
am
e7d32b19: Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev
* commit '
e7d32b19b46c65ff37001e456bedf68222599119':
Take text scale/skew into account only when rendering into a layer
Romain Guy [Mon, 4 Mar 2013 21:49:15 +0000 (21:49 +0000)]
Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev
Romain Guy [Mon, 4 Mar 2013 19:14:26 +0000 (11:14 -0800)]
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
Nick Kralevich [Mon, 4 Mar 2013 21:05:32 +0000 (13:05 -0800)]
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
Irfan Sheriff [Mon, 4 Mar 2013 18:00:37 +0000 (10:00 -0800)]
Clean up statemachine
- Remove a few unnecessary states. Driver is part of kernel for all devices.
- Clean up some logs
Change-Id: Id067bd944fcb01a279485b8fb3251c92a6894c55
Christopher Tate [Mon, 4 Mar 2013 21:41:33 +0000 (21:41 +0000)]
Merge "Don't crash when we get a drag-ended after being detached"
Christopher Tate [Mon, 4 Mar 2013 20:57:23 +0000 (12:57 -0800)]
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.
Bug
8298439
Change-Id: I665ba1d139e8aaa820f5f515186bc4ce8bcdb1ea
Ben Murdoch [Mon, 4 Mar 2013 19:46:00 +0000 (19:46 +0000)]
am
87adbaa3: (-s ours) am
4c333e17: Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev
* commit '
87adbaa3e0d156ea7f8264297b744ad212a68b4c':
Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
Ben Murdoch [Mon, 4 Mar 2013 19:43:37 +0000 (19:43 +0000)]
am
4c333e17: Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev
* commit '
4c333e177220387cf6746d47e1948bbfcc374512':
Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
Ben Murdoch [Mon, 4 Mar 2013 19:40:55 +0000 (19:40 +0000)]
Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev
Craig Mautner [Mon, 4 Mar 2013 19:28:55 +0000 (19:28 +0000)]
Merge "Convert mHistory to mTaskHistory (8)"
Craig Mautner [Mon, 4 Mar 2013 19:24:34 +0000 (19:24 +0000)]
Merge "Convert mHistory to mTaskHistory (7)"
The Android Open Source Project [Mon, 4 Mar 2013 19:10:12 +0000 (19:10 +0000)]
am
e5e78ccb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
e5e78ccb3dcf82c25efd369607524caff5821b1f':
Restore the ability to track native Surface changes Bug #
8230990
Support 3D rotations when drawing text
Account for text alignment in Op bounds calculation
fix issue when replacement bitmap is larger than original.
Revert ActivityManager changes for tasks. DO NOT MERGE
Revert "Fix ListView is not scrolled properly with arrows"
Update histories simultaneously.
Revert "Update histories simultaneously."
Update histories simultaneously.
Add null check to setAppGroupId.
Fix crashing bug in validator.
Switch topRunning* and moveTaskTo*
Trying to unregister a semi connected accessibility service.
Begin switch over to task based history.
Switch to system process before modifying rotation.
The Android Open Source Project [Mon, 4 Mar 2013 19:06:41 +0000 (11:06 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1bf36dd86f8c7a12978de0de6d9c19ec615f78e6
Chris Craik [Mon, 4 Mar 2013 19:03:22 +0000 (19:03 +0000)]
am
3e7dbf53: Merge "Document that degenerate lines wont be drawn" into jb-mr2-dev
* commit '
3e7dbf5373732459b74fd698a6912d6115ed2870':
Document that degenerate lines wont be drawn
JP Abgrall [Mon, 4 Mar 2013 18:59:57 +0000 (18:59 +0000)]
am
62f16bfc: jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
* commit '
62f16bfc5e90f0320ab68b66b5b5b125cada1867':
jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
Chris Craik [Mon, 4 Mar 2013 18:58:18 +0000 (18:58 +0000)]
Merge "Document that degenerate lines wont be drawn" into jb-mr2-dev
JP Abgrall [Sat, 2 Mar 2013 07:38:40 +0000 (23:38 -0800)]
jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
Missing iface8 in call to parseIfaceStats().
Bug:
8304054
Change-Id: Ibb01d86a0f7241cdd8f23401973840673f847efb
Brian Carlstrom [Mon, 4 Mar 2013 18:52:49 +0000 (10:52 -0800)]
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
Chris Craik [Mon, 4 Mar 2013 18:23:54 +0000 (10:23 -0800)]
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
Irfan Sheriff [Mon, 4 Mar 2013 18:38:22 +0000 (18:38 +0000)]
am
d2bfa3bd: Merge "Fix copy constructor" into jb-mr2-dev
* commit '
d2bfa3bdc0a5d3c06cde2711d8572a8141e45fe2':
Fix copy constructor
Irfan Sheriff [Mon, 4 Mar 2013 18:32:49 +0000 (18:32 +0000)]
Merge "Fix copy constructor" into jb-mr2-dev
Irfan Sheriff [Mon, 4 Mar 2013 18:24:22 +0000 (10:24 -0800)]
Fix copy constructor
Bug:
8300712
Change-Id: If1c41a9fe35ca5950382ffcc5759fc14641d0b04
Brian Carlstrom [Mon, 4 Mar 2013 17:50:14 +0000 (17:50 +0000)]
Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
Derek Sollenberger [Mon, 4 Mar 2013 15:24:42 +0000 (15:24 +0000)]
am
cdac4972: Deprecate read/write Pictures to streams.
* commit '
cdac497289fd2c39a352f6167dae3f77cc608cb8':
Deprecate read/write Pictures to streams.
Derek Sollenberger [Fri, 22 Feb 2013 21:08:30 +0000 (16:08 -0500)]
Deprecate read/write Pictures to streams.
bug:
8241089
Change-Id: I435a534f5110cb2b8aba87c047b509020a22fd67
The Android Automerger [Mon, 4 Mar 2013 13:55:46 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Michael Jurka [Mon, 4 Mar 2013 11:00:53 +0000 (11:00 +0000)]
am
7ac02bfb: Merge "Fix RTL layout in Recent Apps, landscape mode" into jb-mr2-dev
* commit '
7ac02bfb862aec324b00f3919ff00a95ff1effa6':
Fix RTL layout in Recent Apps, landscape mode
Michael Jurka [Mon, 4 Mar 2013 10:56:58 +0000 (10:56 +0000)]
Merge "Fix RTL layout in Recent Apps, landscape mode" into jb-mr2-dev
Jeff Sharkey [Sat, 2 Mar 2013 06:20:17 +0000 (06:20 +0000)]
am
2e0da1ea: Merge "Improve performance of storage measurement." into jb-mr2-dev
* commit '
2e0da1ea5f2493d968b4b83d4a0dd54e2cc63849':
Improve performance of storage measurement.
Jeff Sharkey [Sat, 2 Mar 2013 06:14:51 +0000 (06:14 +0000)]
Merge "Improve performance of storage measurement." into jb-mr2-dev
Romain Guy [Sat, 2 Mar 2013 02:12:38 +0000 (02:12 +0000)]
am
151b71cb: Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev
* commit '
151b71cb5259eabf9bdcdc9248ba5100ad4c5bcf':
Fix math issue when transforming text in perspective
Romain Guy [Sat, 2 Mar 2013 02:08:17 +0000 (02:08 +0000)]
Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev
Romain Guy [Sat, 2 Mar 2013 02:07:35 +0000 (18:07 -0800)]
Fix math issue when transforming text in perspective
Change-Id: Iad6b4e477c11bd1ef5f0ceab2fabcd440030154d
Jeff Sharkey [Sat, 2 Mar 2013 01:31:54 +0000 (17:31 -0800)]
am
2048fbb1: am
c807070c: am
1e5e3748: am
67f29573: am
bb2aa63b: am
a2e929e1: Tighten enforcement of file modes.
* commit '
2048fbb1106a639c6b66298b94ab98eb4c650542':
Tighten enforcement of file modes.
Jeff Sharkey [Sat, 2 Mar 2013 01:30:45 +0000 (17:30 -0800)]
am
c807070c: am
1e5e3748: am
67f29573: am
bb2aa63b: am
a2e929e1: Tighten enforcement of file modes.
* commit '
c807070cb54228f1039cd0a3f2fe14efbe46df3e':
Tighten enforcement of file modes.
Jeff Sharkey [Sat, 2 Mar 2013 01:28:32 +0000 (17:28 -0800)]
am
1e5e3748: am
67f29573: am
bb2aa63b: am
a2e929e1: Tighten enforcement of file modes.
* commit '
1e5e3748d4d431e48bd4b6a461ab3a9127beff7d':
Tighten enforcement of file modes.
Jeff Sharkey [Sat, 2 Mar 2013 01:26:07 +0000 (17:26 -0800)]
am
67f29573: am
bb2aa63b: am
a2e929e1: Tighten enforcement of file modes.
* commit '
67f2957331a63474879f68bf1a8d17b60b2188cd':
Tighten enforcement of file modes.
Jeff Sharkey [Sat, 2 Mar 2013 01:23:40 +0000 (17:23 -0800)]
am
bb2aa63b: am
a2e929e1: Tighten enforcement of file modes.
* commit '
bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
Tighten enforcement of file modes.
Jeff Sharkey [Sat, 2 Mar 2013 01:20:51 +0000 (17:20 -0800)]
am
a2e929e1: Tighten enforcement of file modes.
* commit '
a2e929e1df62947b7967258f21fd05b27a571878':
Tighten enforcement of file modes.
Jim Miller [Sat, 2 Mar 2013 00:41:54 +0000 (00:41 +0000)]
Merge "Re-enable USER_PRESENT broadcast in keyguard."
Jeff Sharkey [Sat, 2 Mar 2013 00:12:55 +0000 (16:12 -0800)]
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
Jim Miller [Sat, 2 Mar 2013 00:19:06 +0000 (00:19 +0000)]
Merge "Fix multi-user support in keyguard."
Romain Guy [Sat, 2 Mar 2013 00:19:18 +0000 (00:19 +0000)]
am
28459117: Merge "Precache glyphs at final raster size" into jb-mr2-dev
* commit '
28459117a797bbf09ac589af4c8083a98fdbfb90':
Precache glyphs at final raster size
Jeff Sharkey [Thu, 28 Feb 2013 23:57:36 +0000 (15:57 -0800)]
Tighten enforcement of file modes.
Bug:
8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
Romain Guy [Sat, 2 Mar 2013 00:13:17 +0000 (00:13 +0000)]
Merge "Precache glyphs at final raster size" into jb-mr2-dev
Romain Guy [Fri, 1 Mar 2013 22:31:04 +0000 (14:31 -0800)]
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
Justin Koh [Sat, 2 Mar 2013 00:01:26 +0000 (00:01 +0000)]
am
76f065d2: Merge "Add policy check to always show overflow menu button on TV devices." into jb-mr2-dev
* commit '
76f065d2e9d6354a59bb233b969c8417aff7223b':
Add policy check to always show overflow menu button on TV devices.
Jim Miller [Fri, 1 Mar 2013 23:28:33 +0000 (15:28 -0800)]
Fix multi-user support in keyguard.
This fixes a bug where user0's credentials were required of all users.
LockPatternUtils used to check for the system process of the caller
to determine which user id to use. Now that keyguard is in its own
process, this can no longer be used.
The fix is to use the permission system to see if the calling process
is allowed to interact across users and if so, use the id of the current
user.
Change-Id: I2d7111938bb3bf381f72698c9fa4fb848d237153
Justin Koh [Fri, 1 Mar 2013 23:57:26 +0000 (23:57 +0000)]
Merge "Add policy check to always show overflow menu button on TV devices." into jb-mr2-dev
Michael Wright [Fri, 1 Mar 2013 22:25:50 +0000 (22:25 +0000)]
am
32440aa2: Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev
* commit '
32440aa25d958c8b82e7c17f784defc0a5860c0a':
Unify inputDispatchingTimedOut with keyDispatchingTimedOut
Michael Wright [Fri, 1 Mar 2013 22:20:46 +0000 (22:20 +0000)]
Merge "Unify inputDispatchingTimedOut with keyDispatchingTimedOut" into jb-mr2-dev
Michael Wright [Thu, 28 Feb 2013 01:07:29 +0000 (17:07 -0800)]
Unify inputDispatchingTimedOut with keyDispatchingTimedOut
Bug:
8194916
Change-Id: Iac40108d848bcca77f49a7a49c57a095b3dbe9c9
Selim Gurun [Fri, 1 Mar 2013 21:53:18 +0000 (21:53 +0000)]
am
7be6d4c4: Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev
* commit '
7be6d4c421cfa6f93079517d3ee54024c8049ae5':
Clarify the API documentation for WebSQL database.
Selim Gurun [Fri, 1 Mar 2013 21:46:41 +0000 (21:46 +0000)]
Merge "Clarify the API documentation for WebSQL database." into jb-mr2-dev
Selim Gurun [Fri, 1 Mar 2013 01:47:21 +0000 (17:47 -0800)]
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
Jonathan Dixon [Fri, 1 Mar 2013 21:12:38 +0000 (21:12 +0000)]
am
10010128: Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev
* commit '
10010128088bdbc7b03d38ff594428f8a0d52714':
Remove obsolete target-densitydpi documentation
Jonathan Dixon [Fri, 1 Mar 2013 21:09:05 +0000 (21:09 +0000)]
Merge "Remove obsolete target-densitydpi documentation" into jb-mr2-dev