Commit Graph

49550 Commits

Author SHA1 Message Date
Bill Yi e4f00b2aae Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD 2014-04-29 11:34:19 -07:00
Brian Carlstrom 108ed9fa94 Merge "Fix incorrect odex path handling" 2014-04-28 22:00:35 +00:00
Chih-Wei Huang 0e8ae16f08 Fix incorrect odex path handling
It's wrong to just concatenate the apk_path and .odex.
The bug prevents the prebuilt odex being used since Kitkat.

The patch is copied from the code of JellyBean.

Change-Id: I0ce8a877e3df8ae1ab9a0e3aeeef2d5253efc223
2014-04-28 14:08:16 -07:00
Jesse Hall 3f0d5669eb Merge "Expose core EGL entry points to eglGetProcAddress" 2014-04-21 18:51:18 +00:00
Colin Cross 85085cd6dd Merge "libui: fix passing Fence object over binder" 2014-04-15 02:10:51 +00:00
Colin Cross 288f2ef629 libui: fix passing Fence object over binder
The Fence object was writing a size_t into the binder buffer
in flatten, which changes size if the producer and consumer
are running in a 32-bit and a 64-bit process.  Use a uint32_t
instead.

Change-Id: Ifed526513800ce27f9d605101cddd922292cca37
2014-04-14 19:06:47 -07:00
Nick Kralevich 82fb580955 Merge "restorecon the profile directory." 2014-04-09 19:41:26 +00:00
Stephen Smalley a240733137 restorecon the profile directory.
This is required so that it will be assigned the correct SELinux
security context on first creation by installd.

Bug: 13927667
Change-Id: I4857d031f9e7e60d48b8c72fcb22a81b3a2ebaaa
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-04-09 19:08:20 +00:00
Greg Hackmann 27f8840f22 Merge "make struct Event layout consistent on 32/64-bit" 2014-04-03 17:07:09 +00:00
Glenn Kasten d2f7633277 Merge "AArch64: Correction to OMX_U32 and OMX_S32" 2014-04-03 17:00:59 +00:00
Narayan Kamath 033bdd72f9 Merge "Remove global variables from ProcessState." 2014-04-03 13:59:28 +00:00
Narayan Kamath 162ea0e9e8 Remove global variables from ProcessState.
These weren't really being used and they make it
very hard to reason about who looks at command line
arguments.

Processes started via app_process (this includes all
zygote forks and the system_server) can get information
about command line arguments from the AndroidRuntime
class, which is available via a call to
AndroidRuntime::getRuntime.

bug: 13647418

Change-Id: I6f92680c3619a68c6d4b0995db4cdc9adc788e36
2014-04-03 12:29:44 +00:00
Marcus Oakland 849de60c1e AArch64: Correction to OMX_U32 and OMX_S32
The types of OMX_U32 and OMX_S32 were appropriate to a 32-bit system
but were not appropriate to a 64-bit system. They have been changed to
make them portable between the two systems. With this change and a
change to frameworks/av/media/libstagefright/foundation/AString.cpp,
the android.media.cts.DecoderTest#testFlush CTS test passes.

Change-Id: I8e16c7169f54599c23fea71585b531e48541c78a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-04-02 11:20:01 -07:00
Glenn Kasten 17b5ca1e66 Merge "opengl: fix UAL conformity" 2014-04-02 16:15:59 +00:00
synergy dev dd46c864c1 opengl: fix UAL conformity
GAS assumes .align 2 if .align only is set, however the UAL doesn't enforce this assumption.

Change-Id: I88b567dc84ee8f04a13f2b8e80c3ee41530a9e49
2014-04-02 03:02:48 +00:00
Nick Kralevich 3ebb877e52 Merge "Modify installd's restorecon function." 2014-03-31 20:09:18 +00:00
Robert Craig da30dc7336 Modify installd's restorecon function.
Changes above with PMS and below with libselinux
have resulted in a few changes to the restorecon data
api. This change is needed in order to support the new
way to issue a recursive restorecon of certain
/data/data directories.

The restorecondata function has also been modified to
find all users on the device for a given package name
(argument to the function) and to issue a separate
recursive restorecon call for each.

Change-Id: Ie440cba2c96f0907458086348197e1506d31c1b6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-28 14:32:07 -04:00
Jesse Hall 50ef8562fe Merge "GraphicProducerWrapper may return false transact status" 2014-03-28 04:52:10 +00:00
Michael Chock c0ec5e2333 Expose core EGL entry points to eglGetProcAddress
Required behavior for EGL_KHR_get_all_proc_addresses.

Change-Id: I1e6209ef3cb9f2fa6f22808b077c35139d4cb814
2014-03-27 17:28:40 -06:00
bdeng3X c2633ce19b GraphicProducerWrapper may return false transact status
GraphicProducerWrapper(GPW) changed how the methods of
BpGraphicBufferProducer(BpGBP) are executed.
First, "fake" BpGBP is created. Its remote is GPW. The GPW has
wrapped the real BpGBP.
All the method calls to the fake BpGPB will be intercepted by
the GPW inside it when the methods run into remote()->transact().
Then the GPW will invoke the transact() of the real BpGBP. And
Everything runs well except that the GPW forgets to store the
transact status and always return NO_ERROR to the fake BpGBP.

It would be disastrous if the binder call of the IGBP failed and
the out parameter "reply" of transact() was in unkown state.
E.g. the queueBuffer() in the fake BpGBP will try to operate on
the "reply". This will crash the SurfaceFlinger.

Change-Id: I01b31f64e1fc92804da3f16c1fb1420dcfb3b855
Signed-off-by: bdeng3X <bingx.deng@intel.com>
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
2014-03-27 09:09:19 +08:00
Nick Kralevich b1a8c01637 Merge "Send libselinux logging to logcat." 2014-03-26 15:44:15 +00:00
Stephen Smalley 7abb52bcaf Send libselinux logging to logcat.
Otherwise we can't readily see log messages from libselinux calls
made by installd.

Change-Id: I319b30c181470468fe19dd5fbe9251ef03f1163b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-03-26 09:31:25 -04:00
Xia Wang 6d05ef2310 am 9c7db080: Build the benchmark test to /data/local/tmp/ for automated test
* commit '9c7db08049e1d36c2f60dd703f27c432bc8cfbc5':
  Build the benchmark test to /data/local/tmp/ for automated test
2014-03-24 18:39:57 +00:00
Xia Wang 9c7db08049 Build the benchmark test to /data/local/tmp/ for automated test
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
(cherry picked from commit b7925f1364)
2014-03-24 18:13:19 +00:00
Marco Nelissen 1fcecf56be am 897fe45c: am 23c2fcbb: (-s ours) am c0af9caf: am b14d72bc: am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit '897fe45cf7addc975fc7f9751c88ac53d9b9a778':
  Add support for writing byte arrays to parcels
2014-03-20 20:56:52 +00:00
Marco Nelissen 897fe45cf7 am 23c2fcbb: (-s ours) am c0af9caf: am b14d72bc: am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit '23c2fcbbf4be87580e64132150aa554b764425c2':
  Add support for writing byte arrays to parcels
2014-03-20 20:48:45 +00:00
Marco Nelissen 23c2fcbbf4 am c0af9caf: am b14d72bc: am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit 'c0af9cafba1217e2585777964730c70e40957dcd':
  Add support for writing byte arrays to parcels
2014-03-20 13:26:08 -07:00
Marco Nelissen c0af9cafba am b14d72bc: am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit 'b14d72bce04e990639305890b2aca3ccad5b3ebb':
  Add support for writing byte arrays to parcels
2014-03-20 13:13:23 -07:00
Marco Nelissen b14d72bce0 am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit 'd070009ecdb9e8c58ce5d1540d5bcba5587a0448':
  Add support for writing byte arrays to parcels
2014-03-20 11:11:18 -07:00
Marco Nelissen d070009ecd am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit 'df6774c9a3c1460554208925f38dde08953b6d0b':
  Add support for writing byte arrays to parcels
2014-03-20 11:06:54 -07:00
Marco Nelissen df6774c9a3 am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit '7c1cdbdd68c4f809dc5616654740ea98a275892d':
  Add support for writing byte arrays to parcels
2014-03-20 10:55:05 -07:00
Marco Nelissen 7c1cdbdd68 am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit 'e23f8b8f0bf32e79c1d0f9183c064ab61354c452':
  Add support for writing byte arrays to parcels
2014-03-20 10:48:35 -07:00
Marco Nelissen e23f8b8f0b am 1f70863d: am 37b44969: Add support for writing byte arrays to parcels
* commit '1f70863d13668dc97047df15cce547ebc8435ff2':
  Add support for writing byte arrays to parcels
2014-03-20 10:33:12 -07:00
Marco Nelissen 1f70863d13 am 37b44969: Add support for writing byte arrays to parcels
* commit '37b44969c0ca1d00e213da685dfbb2807f2bab30':
  Add support for writing byte arrays to parcels
2014-03-20 10:04:42 -07:00
Jesse Hall b0f96c4881 am 01502981: Merge "fix valgrind ioctl warning."
* commit '01502981cddb69b9ab7e4bf8bc66366ae0eb7035':
  fix valgrind ioctl warning.
2014-03-20 16:31:17 +00:00
Jesse Hall 01502981cd Merge "fix valgrind ioctl warning." 2014-03-20 16:09:15 +00:00
Fengwei Yin 0c7c81f5a6 make struct Event layout consistent on 32/64-bit
To make struct Event have consistent memory layout between x86
and x86_64, force nsecs_t timestamp align to 64bit because it's
not true for x86.

Change-Id: I49eaddd89e10d595cf6a5130f9762b5388c96625
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
2014-03-20 16:49:06 +08:00
Nick Kralevich bca88f10c9 am 1bf30245: Merge "Extend installd to support SELinux restorecon function."
* commit '1bf30245cbb8be7279fadcf4071cecc8db91789f':
  Extend installd to support SELinux restorecon function.
2014-03-19 20:29:46 +00:00
Nick Kralevich 1bf30245cb Merge "Extend installd to support SELinux restorecon function." 2014-03-19 20:17:24 +00:00
Robert Craig e9887e46ce Extend installd to support SELinux restorecon function.
Implement new restorecondata function which will allow
the relabeling of /data/data and /data/user directories.
This is needed in the case of certain OTAs. Not every
boot will apply this relabeling however. Consult change
I77bf2a0c4c34b1feef6fdf4d6c3bd92dbf32f4a1 for
clarification on this issue.

Change-Id: I05e8b438950ddb908e46c9168ea6ee601e6d674f
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-19 17:37:48 +00:00
Kenny Root 9ff2aad010 am 5b61ad2c: Check the padded size of the read byte array
* commit '5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
  Check the padded size of the read byte array
2014-03-17 21:28:33 +00:00
Kenny Root 5b61ad2cda Check the padded size of the read byte array
Bug: 13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
2014-03-17 13:18:16 -07:00
Marco Nelissen 37b44969c0 Add support for writing byte arrays to parcels
b/13418320

Cherrypicked from f0190bff38
https://googleplex-android-review.git.corp.google.com/#/c/433320/

Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-17 11:13:30 -07:00
Marco Nelissen 446ef4bae2 am f0190bff: Add support for writing byte arrays to parcels
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
  Add support for writing byte arrays to parcels
2014-03-14 23:32:45 +00:00
Mark Salyzyn c45011f272 am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
  native frameworks: 64-bit compile issues
2014-03-13 23:18:43 +00:00
Marco Nelissen f0190bff38 Add support for writing byte arrays to parcels
b/13418320

Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-13 14:17:40 -07:00
Mark Salyzyn cdbf28b3f7 Merge "native frameworks: 64-bit compile issues" 2014-03-13 15:20:45 +00:00
Anwar Ghuloum f4b08ebc61 am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."
* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
  Fix parameter ordering for installd's dex2oat execl.
2014-03-13 03:43:10 +00:00
Mark Salyzyn 92dc3fc52c native frameworks: 64-bit compile issues
- Fix format (print/scanf)
- Suppress unused argument warning messages (bonus)

Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728
2014-03-12 13:12:44 -07:00
Anwar Ghuloum 06ed949141 Merge "Fix parameter ordering for installd's dex2oat execl." 2014-03-11 23:11:02 +00:00