121489 Commits

Author SHA1 Message Date
Baligh Uddin
da6b9599c7 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-10 15:51:37 +00:00
Narayan Kamath
3603970d3a am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit '940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
  Removed android.debug.JNITest from preloaded-classes
2014-04-10 11:25:56 +00:00
Narayan Kamath
940e76fd37 am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"
* commit 'b827f78e7acee3a604c315615268edf7098dc184':
  Removed android.debug.JNITest from preloaded-classes
2014-04-10 11:21:33 +00:00
Narayan Kamath
b827f78e7a Merge "Removed android.debug.JNITest from preloaded-classes" 2014-04-10 11:18:28 +00:00
Narayan Kamath
d35d3e5d39 Dual zygote cleanup.
- Use different process names for the 32 / 64 bit zygote.
- Pass command line arguments correctly. The first unmatched
  argument must be passed through to the java main class.

Change-Id: I952ebbdbba941f118d992354b9bd0ada2dade417
2014-04-10 12:15:39 +01:00
Narayan Kamath
9e289d70a8 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
  System services detect and register app CPU ABIs
2014-04-10 09:26:59 +00:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
2014-04-10 09:26:44 +00:00
Narayan Kamath
1d26a3f1ef am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
  System services detect and register app CPU ABIs
2014-04-10 09:23:33 +00:00
Narayan Kamath
0fd40cb100 am 80413c9f: Merge "Re-implement native library search and copies."
* commit '80413c9fe10acf36eaecd139198c7fc17e8af2e6':
  Re-implement native library search and copies.
2014-04-10 09:23:30 +00:00
Narayan Kamath
09e13cc5f9 Merge "System services detect and register app CPU ABIs" 2014-04-10 09:20:22 +00:00
Narayan Kamath
80413c9fe1 Merge "Re-implement native library search and copies." 2014-04-10 09:19:38 +00:00
Deepanshu Gupta
849a8208c8 Add DatePickerDialog to layoutlib [DO NOT MERGE]
Includes android.app.DatePickerDialog in the layoutlib.jar

Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
(cherry picked from commit c2016d4073c61e87439d4fa14837b397a3c1630a)
2014-04-10 00:21:57 +00:00
Zhihai Xu
5449919462 am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev
* commit '2e8a2d207f446e156a8cfb9532cdfb569caa9458':
  LE: Return false if an attribute read/write is in progress
2014-04-09 23:50:39 +00:00
Jesse Gunsch
3c1c137579 am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
* commit '8d31358fb4f0f948fcfd07399d4247375dc5eea9':
  Merge "NsdService does not clean up after exiting clients"
2014-04-09 23:50:35 +00:00
Jeff Brown
6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
2014-04-09 16:47:40 -07:00
Zhihai Xu
2e8a2d207f Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev 2014-04-09 18:19:04 +00:00
Jesse Gunsch
8d31358fb4 Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 2014-04-09 18:09:03 +00:00
Andre Eisenbach
cc68cc962d LE: Return false if an attribute read/write is in progress
bug:12109128
Change-Id: I0155fcddc850aba47a1bf3e174d4ee582d50b187
2014-04-09 10:59:44 -07:00
Baligh Uddin
f7d65ae852 Import translations. DO NOT MERGE
Change-Id: I974afb393ebd8cf341012d3c08cad60b578cda30
Auto-generated-cl: translation import
2014-04-09 09:53:03 -07: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
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
Mark Salyzyn
7a67c927e6 am ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit 'ecdf9b199ac9659c37c34c0b23084199acea80bf':
  jni: liblog reading error API incorrect
2014-04-09 16:11:04 +00:00
Mark Salyzyn
ecdf9b199a Merge "jni: liblog reading error API incorrect" 2014-04-09 16:07:48 +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
b6ab8c17bd am a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit 'a6f5e79dd182b05909fa53109e74638afcd7ee12':
  Allow connections to multiple zygotes.
2014-04-09 14:15:16 +00:00
Narayan Kamath
a6f5e79dd1 Merge "Allow connections to multiple zygotes." 2014-04-09 14:12:23 +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
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
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
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
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
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
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
Dave Platt
8e5df442cd Merge "NsdService does not clean up after exiting clients" 2014-04-08 17:35:57 -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
Adam Hampson
668b1bf80b resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp
Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f
2014-04-08 10:24:47 -07:00
Adam Hampson
bd6c5577ab Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev 2014-04-08 15:51:23 +00:00
Narayan Kamath
f626ca2c96 Don't allow MemoryFiles of negative length.
Prevents us from converting a (signed) jint into an
(unsigned) size_t and having horrible things happen.

Change-Id: I0f04e2eb9852ae7fc49b435fd0974f56e86751a4
2014-04-08 16:14:10 +01:00
Baligh Uddin
56868fbcd9 am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '0cf836a77821afe8ff6cdfdaa3b55987cb6317da':
  Import translations. DO NOT MERGE
2014-04-08 02:20:37 +00:00