Narayan Kamath
a6f5e79dd1
Merge "Allow connections to multiple zygotes."
2014-04-09 14:12:23 +00:00
Narayan Kamath
19500831a6
am 7be06900: am 9f777008: am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs."
...
* commit '7be06900a824babd17c5f4e018c08aeca9ba57e3':
Make zygotes aware of their supported ABIs.
2014-04-09 14:08:34 +00:00
Narayan Kamath
26cd91f7aa
am 8ee0b48d: am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."
...
* commit '8ee0b48d607fd6afc5e75f56bdadce19272c60ff':
Clean up argc / argv processing for runtime args.
2014-04-09 14:08:31 +00:00
Narayan Kamath
4444dcd0ad
Allow connections to multiple zygotes.
...
Adds a new String argument "abi" to Process.start.
This method will now query the zygotes to
determine what ABIs the primary and the secondary
zygote support (the secondary is optional) and dispatch
a fork request over the right zygote connection.
Both zygotes are assumed to be active at all points.
Change-Id: I460319b4481ff1c1666e8172223691820658a35c
2014-04-09 15:07:10 +01:00
Narayan Kamath
7be06900a8
am 9f777008: am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs."
...
* commit '9f777008eaead3cb9cee80d0c00e5a3d55de9de7':
Make zygotes aware of their supported ABIs.
2014-04-09 14:06:14 +00:00
Narayan Kamath
8ee0b48d60
am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."
...
* commit '97175deb446cdaca7f3910b71940cb443bda3cc4':
Clean up argc / argv processing for runtime args.
2014-04-09 14:06:10 +00:00
Narayan Kamath
a00ed7f725
am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
...
* commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626':
Move certain internal activity manager methods to new class.
2014-04-09 14:03:47 +00:00
Narayan Kamath
9f777008ea
am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs."
...
* commit '05f980d42d4926ab2130cdcf9e646eb610a7080b':
Make zygotes aware of their supported ABIs.
2014-04-09 14:02:18 +00:00
Narayan Kamath
97175deb44
am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."
...
* commit '3856a219fa414ee53c5ef3a0c35dae35e2ca80b1':
Clean up argc / argv processing for runtime args.
2014-04-09 14:02:08 +00:00
Narayan Kamath
05f980d42d
am d4b64409: Merge "Make zygotes aware of their supported ABIs."
...
* commit 'd4b644092e8d2719d01ad297b080bd50b1fdf60d':
Make zygotes aware of their supported ABIs.
2014-04-09 13:59:00 +00:00
Narayan Kamath
3856a219fa
am cecfb94f: Merge "Clean up argc / argv processing for runtime args."
...
* commit 'cecfb94f3f1b2978ba66342d7920e83770c808e3':
Clean up argc / argv processing for runtime args.
2014-04-09 13:58:57 +00:00
Narayan Kamath
a981e3b01a
resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
...
Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316
2014-04-09 14:57:59 +01:00
Narayan Kamath
d4b644092e
Merge "Make zygotes aware of their supported ABIs."
2014-04-09 13:55:58 +00:00
Narayan Kamath
cecfb94f3f
Merge "Clean up argc / argv processing for runtime args."
2014-04-09 13:55:54 +00:00
Narayan Kamath
c41638cb75
Make zygotes aware of their supported ABIs.
...
Query system properties for the list of ABIs and pass
it as a command line argument to ZygoteInit.
Also add a new Zygote command that returns this list of
ABIs to peers.
Change-Id: I68034c6f63fa626911122579a011a0a25a8cda94
2014-04-09 13:41:15 +01:00
Narayan Kamath
22ec1eefa4
Clean up argc / argv processing for runtime args.
...
- Make copies of argc, argv before argv is potentially
overwritten with the process name.
- Allow multiple command line arguments to be passed to
ZygoteInit (this is required for some of the 64 bit
zygote work).
- Add an explanatory comment about how these argments
are processed.
Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
2014-04-09 13:39:41 +01:00
Narayan Kamath
931ec9861d
am 33ea32fd: am dc7eb9c9: am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
...
* commit '33ea32fd4e5edd7920adecd17ca69defd0c4ba93':
Don't allow MemoryFiles of negative length.
2014-04-09 12:23:25 +00:00
Narayan Kamath
33ea32fd4e
am dc7eb9c9: am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
...
* commit 'dc7eb9c947f36cbd34021663845bcbb090c3169d':
Don't allow MemoryFiles of negative length.
2014-04-09 12:20:01 +00:00
Kenny Guy
b784027b8c
am 9d43dc5e: Merge "Finish rename of related users to profiles."
...
* commit '9d43dc5e4eba1bf96f0b8fa5deae5ee61a7f85ad':
Finish rename of related users to profiles.
2014-04-09 11:45:45 +00:00
Kenny Guy
9d43dc5e4e
Merge "Finish rename of related users to profiles."
2014-04-09 11:42:40 +00:00
Narayan Kamath
dc7eb9c947
am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
...
* commit '00cfbe82fa80ef57f3b1c34e47836d3e28c381b8':
Don't allow MemoryFiles of negative length.
2014-04-09 11:33:20 +00:00
Yohann Roussel
f61fb541fb
am 900224af: Merge "A stress test for concurent multidex extraction."
...
* commit '900224afc281647710618a02347c2b8de8f19837':
A stress test for concurent multidex extraction.
2014-04-09 09:52:42 +00:00
Yohann Roussel
900224afc2
Merge "A stress test for concurent multidex extraction."
2014-04-09 09:49:58 +00:00
Jeff Brown
b2bd00447d
am 50807c17: am 7f9599d6: (-s ours) am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
...
* commit '50807c178f8d491637cc3f7c83161258a9374ed7':
Move display power controller to display manager service. (DO NOT MERGE)
2014-04-09 09:22:07 +00:00
Sander Alewijnse
5b25236a87
am c03dea76: Merge "Changed tag name and error strings for PersistentPreferredActivity storage."
...
* commit 'c03dea76307163b95a313ba3e887aa94ed01dc2c':
Changed tag name and error strings for PersistentPreferredActivity storage.
2014-04-09 09:18:21 +00:00
Jeff Brown
50807c178f
am 7f9599d6: (-s ours) am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
...
* commit '7f9599d63c892934c7f8a2e46d1e518ddb0d43df':
Move display power controller to display manager service. (DO NOT MERGE)
2014-04-09 09:17:10 +00:00
Sander Alewijnse
c03dea7630
Merge "Changed tag name and error strings for PersistentPreferredActivity storage."
2014-04-09 09:14:50 +00:00
Jeff Brown
7f9599d63c
am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
...
* commit 'ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
Move display power controller to display manager service. (DO NOT MERGE)
2014-04-09 09:12:40 +00:00
Narayan Kamath
00cfbe82fa
am a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
...
* commit 'a5608acbd7647e0fd9aa87e5319715b0cbd6b0c0':
Don't allow MemoryFiles of negative length.
2014-04-09 09:09:58 +00:00
Narayan Kamath
a5608acbd7
Merge "Don't allow MemoryFiles of negative length."
2014-04-09 09:07:29 +00:00
Jeff Brown
4cf85c740d
am 1b03d160: Merge "Move display power controller to display manager service."
...
* commit '1b03d160114b1ea553f322e99ca168965daffea8':
Move display power controller to display manager service.
2014-04-09 04:44:55 +00:00
Jeff Brown
7289f3ab8f
Merge "Move certain internal activity manager methods to new class." into klp-modular-dev
2014-04-09 04:36:51 +00:00
Jeff Brown
1b03d16011
Merge "Move display power controller to display manager service."
2014-04-09 04:36:22 +00:00
Jeff Brown
131206b8a9
Move display power controller to display manager service.
...
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.
Bug: 13133142
Change-Id: I159a060088344d8e6fcdf9208a1f242960f7ab90
2014-04-08 21:34:32 -07:00
Jeff Brown
ea72cdf22f
Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
2014-04-09 04:33:27 +00:00
Jeff Brown
13014b5fe5
Move certain internal activity manager methods to new class.
...
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.
Deleted the startRunning method since it is no longer useful.
Bug: 13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
2014-04-08 20:51:07 -07:00
Jeff Brown
ad9ef191f5
Move display power controller to display manager service. (DO NOT MERGE)
...
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes. Some bits will be cleaned up in
a subsequent patch.
Bug: 13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
2014-04-08 20:41:46 -07:00
Tor Norbye
90c092567f
am 37eaebe7: Merge "Add resource reference annotations"
...
* commit '37eaebe7f25efd9f785f735f1aab0f842a8b1594':
Add resource reference annotations
2014-04-09 01:40:37 +00:00
Tor Norbye
37eaebe7f2
Merge "Add resource reference annotations"
2014-04-09 01:37:43 +00:00
Chris Craik
defb7f37fe
When recording a child node into a parent, read staging projection property
...
bug:13770920
The other properties should not be read from the UI thread.
Change-Id: I61d13774553d46a8963623727d8e8eeeb3385cc9
2014-04-08 18:17:07 -07:00
Zhijun He
60ad8277ce
am d178496b: Camera2: Make colorFilterArrangement public
...
* commit 'd178496b7e823efdc9c9780ab1d980207a36a19a':
Camera2: Make colorFilterArrangement public
2014-04-09 01:15:17 +00:00
Zhijun He
d178496b7e
Camera2: Make colorFilterArrangement public
...
It will be used by DNG
Also fix a typo in spec.
Change-Id: I8427df6b28149c0f8ced27b110efe96dd38357f4
2014-04-09 00:50:00 +00:00
Amith Yamasani
eaf0d1ab08
am cc4e9e69: Merge "Avoid security exception when requesting badging"
...
* commit 'cc4e9e69d2ef90f07f9fd3722cf3fe93ef8aa5f7':
Avoid security exception when requesting badging
2014-04-09 00:45:49 +00:00
Alan Viverette
36ad556e7a
am 91c8f753: Merge "Theming for more VectorDrawable attrs, add attrs to test app"
...
* commit '91c8f753ab841342a904fa3efa81f4c6edf2b72a':
Theming for more VectorDrawable attrs, add attrs to test app
2014-04-09 00:45:46 +00:00
Christopher Tate
8d2a6ae4af
am f208fd46: Merge "Don\'t crash on null installer package bookkeeping."
...
* commit 'f208fd46c5242624f9e5e4e78e68e68c246f1d8b':
Don't crash on null installer package bookkeeping.
2014-04-09 00:45:43 +00:00
Zhijun He
91f8275ffa
am 2d603b07: Merge "ImageReader: Fix raw buffer size calculation issue"
...
* commit '2d603b07d43888954cd63e092ce6dd071edb433e':
ImageReader: Fix raw buffer size calculation issue
2014-04-09 00:45:40 +00:00
Alan Viverette
bada6dc17a
am 2989c2cb: Merge "Make Drawable hotspot APIs public"
...
* commit '2989c2cb5c649a0035db18f5f7f25ae5c34d2721':
Make Drawable hotspot APIs public
2014-04-09 00:45:36 +00:00
Deepanshu Gupta
7a2333631e
am 733217e6: Merge "Update layoutlib create README"
...
* commit '733217e6768757c50e1ac38644c2ecdbe522e8f5':
Update layoutlib create README
2014-04-09 00:45:33 +00:00
Jae Seo
88865f3dd9
am 121db9e8: Merge "Unhide TvInputSession"
...
* commit '121db9e8525163a867915adfd23a08cf1300d4fa':
Unhide TvInputSession
2014-04-09 00:45:30 +00:00
Deepanshu Gupta
a4ce30fd86
am 6e5e160f: Merge "Make layoutlib load on Java 7 VM"
...
* commit '6e5e160f19c404c272e70f7f0ade5b27850ebd05':
Make layoutlib load on Java 7 VM
2014-04-09 00:45:27 +00:00