Commit Graph

49658 Commits

Author SHA1 Message Date
Jesse Hall
4314ccd1ba am 70278fbf: Merge "Add error message for hints when exceptions occur during binder transactions."
* commit '70278fbfe012c1fce3e63a41ffb9feaf1e53a64a':
  Add error message for hints when exceptions occur during binder transactions.
2014-05-05 17:27:46 +00:00
Jesse Hall
70278fbfe0 Merge "Add error message for hints when exceptions occur during binder transactions." 2014-05-05 17:26:00 +00:00
Francis Hart
378ef07760 Use asynchronous lock/unlock API
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.

This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.

Change-Id: I77daa1beb197b63b1c2f281b8414ac4ae4b5b03c
2014-05-02 13:28:14 -07:00
Narayan Kamath
44df726a6c am cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit 'cb079c899ac9d9c5ec90840249821f58c817406c':
  Add instruction-set arguments to installd commands.
2014-05-01 14:00:54 +00:00
Narayan Kamath
cb079c899a Merge "Add instruction-set arguments to installd commands." 2014-05-01 13:57:13 +00:00
Narayan Kamath
1b40032077 Add instruction-set arguments to installd commands.
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.

(cherry picked from commit 791781bfb8)

Change-Id: I43396b16f6eaecacf0fb7d052526fc5a239167ac
2014-05-01 11:38:02 +01:00
Bill Yi
e4f00b2aae Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD 2014-04-29 11:34:19 -07:00
Jun Jiang
abf8a2c608 Add error message for hints when exceptions occur during binder transactions.
It can help to detect some kind of error, such as why GraphicBuffer::flatten
will crash when handle is null.

Change-Id: I703cd035b96edb7afb324cf24d8230d4e55f4f52
Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
2014-04-29 14:22:10 +08:00
Jun Jiang
e2d1157381 fix GraphicBuffer::flatten crash issue when handle is null
Change-Id: I0d3727e4366cac355791e52cb7790bf8f3c51527
Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
2014-04-29 14:15:36 +08: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