49258 Commits

Author SHA1 Message Date
Mark Salyzyn
53f3bfda92 am 1b1c0218: am 280fe930: am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '1b1c021858daca0e77c106503798c2c47cb372b4':
  jni: liblog reading error API incorrect
2014-04-09 16:22:23 +00:00
Ramin Zaghi
ff0c470833 System services detect and register app CPU ABIs
This patch uses the NativeLibraryHelper class to
match native libraries in an .apk package with
those listed in 'ro.cpu.abilist' property.
The result is stored in packages.xml and the
ApplicationInfo class.

This information will be used by the ActivityManager
to decide which zygote to use to launch the given
app.

Change-Id: I3ec3d050996d8f4621f286ca331b9ad47ea26fa0
2014-04-09 17:20:13 +01:00
Mark Salyzyn
1b1c021858 am 280fe930: am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '280fe930a432d9e2ead8c4b58ce76a0ee45742e7':
  jni: liblog reading error API incorrect
2014-04-09 16:19:47 +00:00
Ramin Zaghi
1378aba7ae Re-implement native library search and copies.
We now use a two step approach :

- First we look through the list of shared libraries in an
  APK, and choose an ABI based on the (priority)  list of ABIs
  a given device supports.
- Then we look through the list of shared libraries and copy
  all shared libraries that match the ABI we've selected.

This fixes a long-standing bug where we would sometimes copy
a mixture of different ABIs to the device, and also allows us
to clearly pick an ABI to run an app with.

The code in NativeLibraryHelper has been refactored so that all
file name validation & matching logic is done in a single place
(NativeLibrariesIterator). This allows us to avoid a lot of
redundant logic and straightens out a few corner cases (for eg.
where the abi determination & copying logic do not agree on
what files to skip).

bug: https://code.google.com/p/android/issues/detail?id=65053
bug: 13647418

Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef
Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com>
Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com>
Co-Authored-By: Narayan Kamath <narayan@google.com>
2014-04-09 17:16:40 +01:00
Mark Salyzyn
280fe930a4 am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '7a67c927e622bb176b21455b8ed56c76b8e0f602':
  jni: liblog reading error API incorrect
2014-04-09 16:14:41 +00:00
Jorim Jaggi
251957d76e Double tap interaction for notifications on lockscreen.
This change also uses a different background for notifications on the
lockscreen and moves the background drawable from the templates to
SystemUI.

Bug: 13635952
Change-Id: Icf09178065aa7fc0472adef70342d637fbcca785
2014-04-09 18:11:45 +02:00
Mark Salyzyn
ecdf9b199a Merge "jni: liblog reading error API incorrect" 2014-04-09 16:07:48 +00:00
Paul McLean
c837a45194 Revert "Revert "Initial implementation of USB Audio output.""
This reverts commit f2f80c09b668176b3b1e619457ae628432636507.
2014-04-09 09:04:43 -07:00
Narayan Kamath
0c93c7109e am 10bdb4b9: am 769a2475: am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '10bdb4b9e966f0a3d8e1099bf8eff4c41c31981c':
  Allow connections to multiple zygotes.
2014-04-09 14:27:58 +00:00
Narayan Kamath
10bdb4b9e9 am 769a2475: am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '769a247595cb78536fa159e8f5d54191a4ef90c6':
  Allow connections to multiple zygotes.
2014-04-09 14:24:56 +00:00
Narayan Kamath
769a247595 am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit 'b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3':
  Allow connections to multiple zygotes.
2014-04-09 14:19:46 +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
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
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
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
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
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
Jae Seo
88865f3dd9 am 121db9e8: Merge "Unhide TvInputSession"
* commit '121db9e8525163a867915adfd23a08cf1300d4fa':
  Unhide TvInputSession
2014-04-09 00:45:30 +00:00
Alan Viverette
47b32b6525 am 821129f2: Merge "Fix action bar theming"
* commit '821129f228527511c961cd03daa571bdeef236cc':
  Fix action bar theming
2014-04-09 00:45:15 +00:00
Amith Yamasani
a7d72d34af am 5784b398: Merge "Launcher APIs and broadcasts for managed profiles"
* commit '5784b39843bd3d6112352ff3b736a6498107911c':
  Launcher APIs and broadcasts for managed profiles
2014-04-09 00:45:12 +00:00
Amith Yamasani
cc4e9e69d2 Merge "Avoid security exception when requesting badging" 2014-04-09 00:26:18 +00:00
Amith Yamasani
5abdbb6560 Avoid security exception when requesting badging
When requesting badged icons, use APIs that don't require the caller
to have MANAGE_USERS permission.

Change-Id: I218cdf5194f38f4affa1874a6fcb43a040ed5295
2014-04-08 17:23:46 -07:00
Alan Viverette
7f1ab7a43f Theming for more VectorDrawable attrs, add attrs to test app
BUG: 13878079
Change-Id: Ibcc8d67446c44cd8f681230fc484c7dc7411ffab
2014-04-08 17:12:43 -07:00
Mark Salyzyn
b519aeca47 jni: liblog reading error API incorrect
- return value contains -errno on error.

Bug: 13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
2014-04-08 16:17:51 -07:00