OSDN Git Service
Brian Carlstrom [Tue, 17 Jun 2014 19:51:37 +0000 (19:51 +0000)]
Merge "Fix obsolete argument name"
Brian Carlstrom [Mon, 16 Jun 2014 20:28:03 +0000 (13:28 -0700)]
Fix obsolete argument name
Change-Id: I8030f055ee49dc86d4592f36791edddfc0d60a31
Narayan Kamath [Mon, 16 Jun 2014 13:19:11 +0000 (13:19 +0000)]
Merge "Add an installd command to prune dex files."
Narayan Kamath [Fri, 13 Jun 2014 09:29:23 +0000 (09:29 +0000)]
Merge "Remove Parcel::writeIntPtr."
Narayan Kamath [Thu, 12 Jun 2014 14:24:06 +0000 (15:24 +0100)]
Remove Parcel::writeIntPtr.
All uses of this API have been removed. It should
never have been made public in the first place.
bug:
15424960
(cherry picked from commit
7da40c0a84dd89e92201448dd5ed3387dc94df2b)
Change-Id: I8d89f62dbdaee7149ef908e0c97417b85e0c48a2
Nick Kralevich [Thu, 12 Jun 2014 23:05:09 +0000 (23:05 +0000)]
Merge "installd: change profile files to 0660"
Nick Kralevich [Thu, 12 Jun 2014 01:23:59 +0000 (18:23 -0700)]
installd: change profile files to 0660
Profiling information leaks data about how people interact
with apps, so we don't want the data to be available
to other apps. Only the app and system_server need access.
Don't create the /data/dalvik-cache/profiles directory. init.rc
does it for us now.
Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
Nick Kralevich [Thu, 12 Jun 2014 21:00:42 +0000 (21:00 +0000)]
Merge "Add SELinux checks when adding a service."
Riley Spahn [Thu, 5 Jun 2014 18:07:18 +0000 (11:07 -0700)]
Add SELinux checks when adding a service.
Add a MAC check to the svc_can_register function in
service_manager. The types are defined in
external/sepolicy/service.te and the mapping from service
names is defined in external/sepolicy/service_contexts.
Currently uses the property context backend to parse the
contexts file.
Bug:
12909011
Change-Id: I5d90a614263c60571c7c70c2882e6fa929911ca5
Mark Salyzyn [Thu, 12 Jun 2014 16:03:00 +0000 (16:03 +0000)]
Merge "sensorservice: 64-bit compile issues"
Mark Salyzyn [Tue, 10 Jun 2014 21:50:02 +0000 (14:50 -0700)]
sensorservice: 64-bit compile issues
Change-Id: Ied7b779f39e71d041791729f7355b052b63903c5
Calin Juravle [Wed, 11 Jun 2014 08:45:16 +0000 (08:45 +0000)]
Merge "Pass --top-k-profile-threshold to dex2oat if available."
Narayan Kamath [Tue, 10 Jun 2014 12:16:47 +0000 (13:16 +0100)]
Add an installd command to prune dex files.
This is a straightforward port of logic from
PackageManagerService#pruneDexFiles.
bug:
14407732
Change-Id: I892cff027ddcbb1a4fb37a7af5ecf1697049a188
Calin Juravle [Fri, 6 Jun 2014 15:58:43 +0000 (16:58 +0100)]
Pass --top-k-profile-threshold to dex2oat if available.
Also, don't pass --profile-file if the file is empty.
Bug:
12877748
Change-Id: I587d198e64da709930e2cea50a87fed1525281e5
Ying Wang [Mon, 9 Jun 2014 22:52:48 +0000 (22:52 +0000)]
Merge "Don't set LOCAL_MODULE_PATH for native tests."
Ying Wang [Mon, 9 Jun 2014 22:23:46 +0000 (15:23 -0700)]
Don't set LOCAL_MODULE_PATH for native tests.
The build system will set it up automatically.
Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
Mark Salyzyn [Mon, 9 Jun 2014 21:38:00 +0000 (21:38 +0000)]
Merge "libgui: 64-bit compile issues"
Mark Salyzyn [Mon, 9 Jun 2014 21:27:45 +0000 (14:27 -0700)]
libgui: 64-bit compile issues
Change-Id: I29961c1567b8431518a7d032ea43385e23b7bb37
Robin Lee [Mon, 9 Jun 2014 12:44:33 +0000 (12:44 +0000)]
Merge "Migrate keychain directories to /data/misc/user/0"
Calin Juravle [Mon, 9 Jun 2014 09:15:09 +0000 (09:15 +0000)]
Merge "Don't always add profile-file option to dex2oat"
Jesse Hall [Fri, 6 Jun 2014 23:49:40 +0000 (23:49 +0000)]
Merge "Add aarch64 EGL/GLES trampolines"
Jesse Hall [Sat, 31 May 2014 06:32:12 +0000 (23:32 -0700)]
Add aarch64 EGL/GLES trampolines
Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
Calin Juravle [Fri, 6 Jun 2014 13:42:16 +0000 (14:42 +0100)]
Don't always add profile-file option to dex2oat
Add profile-file option to dex2oat only if the profiler is active and
the file exists.
Bug:
12877748
Bug:
15275634
Change-Id: Icef76514c912c88311ed108f2be7a6329131f741
Narayan Kamath [Fri, 6 Jun 2014 10:05:08 +0000 (10:05 +0000)]
Merge "Fix flattening/unflattening of android::Sensor."
Robin Lee [Tue, 29 Apr 2014 18:42:01 +0000 (19:42 +0100)]
Migrate keychain directories to /data/misc/user/0
With new CA certificates being stored in /data/misc/user/<userid>/
existing ones need to be moved into the same place.
After this update only the owner user will have custom trusted CAs; all
other users will revert to the default set.
Change-Id: I14a4cd6048685902ad5dd3b53494b03fadc41c04
Robin Lee [Thu, 5 Jun 2014 17:18:23 +0000 (17:18 +0000)]
Merge "Add installd command to create /data/misc user dir"
Robin Lee [Fri, 25 Apr 2014 14:05:19 +0000 (15:05 +0100)]
Add installd command to create /data/misc user dir
New command 'mkuser <id>' sets up a user directory in /data/misc/user/,
readable by all apps within that user and writeable by the local system
process.
Change-Id: I5ddde8c4a80f606e723bb41aa64581a0720842d5
Narayan Kamath [Wed, 4 Jun 2014 14:53:08 +0000 (14:53 +0000)]
Merge "Fix mips build for libbinder."
Narayan Kamath [Wed, 4 Jun 2014 14:04:29 +0000 (15:04 +0100)]
Fix mips build for libbinder.
Mips specific code was using an uninitialized variable.
(cherry picked from commit
2c68d380c9ef765a7d46e5a4735f39e6c27849f2)
Change-Id: I6b562b3f6d2084b72e747736cbf43684c2049f8e
Mark Salyzyn [Tue, 3 Jun 2014 19:40:00 +0000 (19:40 +0000)]
Merge "binder: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 23:35:57 +0000 (16:35 -0700)]
binder: Turn on -Werror
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
Narayan Kamath [Tue, 3 Jun 2014 10:06:55 +0000 (10:06 +0000)]
Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
Narayan Kamath [Fri, 30 May 2014 13:40:13 +0000 (14:40 +0100)]
Fix flattening/unflattening of android::Sensor.
Write string lengths as uint32_t so that their width is
the same on 32 and 64 bit processes.
Note that this fixes another bug as a side effect; getFlattenedSize
was assuming that sizeof(uint32_t) == sizeof(size_t).
Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
Fengwei Yin [Fri, 23 May 2014 21:32:09 +0000 (05:32 +0800)]
x86_64: Align uint64_t/int64_t structure member to 8 bytes
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
Mark Salyzyn [Thu, 29 May 2014 20:29:32 +0000 (20:29 +0000)]
am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
63645c69e03cf3862c52cfde6cbd5f5143ccd38a':
binder: rm utils/Debug.h
Mark Salyzyn [Thu, 29 May 2014 20:26:48 +0000 (20:26 +0000)]
Merge "binder: rm utils/Debug.h"
Mark Salyzyn [Thu, 29 May 2014 20:09:22 +0000 (13:09 -0700)]
binder: rm utils/Debug.h
Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
Brian Carlstrom [Thu, 29 May 2014 19:39:48 +0000 (19:39 +0000)]
am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
f3e4fda09106cb93bddea35a2cc7dbd4b2c281e9':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:36:41 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
aefe55f0fb9e69be205497ef4fc3432d2f7a2d8b)
Change-Id: I05b1a7dd1ef30b3366b52b46bfc7b39cfb3be198
Elliott Hughes [Thu, 29 May 2014 01:02:16 +0000 (01:02 +0000)]
am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
03e2f8fa13a791d744758ec9ffe27f52cab730d0':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 00:59:01 +0000 (00:59 +0000)]
Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
Brian Carlstrom [Wed, 28 May 2014 22:31:43 +0000 (22:31 +0000)]
am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
97a51ad44ae3dcf4976076382923ddcae16233ee':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:41 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
c4ac3124ffb51f13bb4206e9f8452a3712eb09cb)
Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
Brigid Smith [Wed, 28 May 2014 21:23:24 +0000 (14:23 -0700)]
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Bug:
15116468
Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc
Jesse Hall [Tue, 27 May 2014 23:29:20 +0000 (23:29 +0000)]
am
dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
* commit '
dc2736219fa897840d1ff12b11cd7defb636f845':
EGL: add x86/64 assembly code for EGL/GLES wrappers
Jesse Hall [Tue, 27 May 2014 23:26:15 +0000 (23:26 +0000)]
Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
mwajdecz [Mon, 26 May 2014 11:56:37 +0000 (13:56 +0200)]
EGL: add x86/64 assembly code for EGL/GLES wrappers
There was no explicit support for x86/64 architecture in EGL/GLES wrappers.
This resulted either in failures or sub-optimal implementation of the wrapper functions.
Change-Id: I20d99d7372fbf642ee4b94a05c8cb971cba29988
Signed-off-by: Wajdeczko, Michal <michal.wajdeczko@intel.com>
Narayan Kamath [Fri, 16 May 2014 12:08:06 +0000 (12:08 +0000)]
am
c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
c9fcaf3751af078ad730913304431197e4d1ae80':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:06:10 +0000 (12:06 +0000)]
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Narayan Kamath [Fri, 2 May 2014 16:53:33 +0000 (17:53 +0100)]
Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from
bc6001b026069714177526eb1120b0011d6f2a51)
Change-Id: I28e87050478920a54132efbbb8138076ebad1409
Nick Kralevich [Tue, 13 May 2014 20:35:38 +0000 (20:35 +0000)]
am
b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
* commit '
b66ee6c32d87961d5b9f0be97b5fdccb928fd453':
Ensure that app lib symlinks are correctly labeled when created.
Nick Kralevich [Tue, 13 May 2014 20:32:19 +0000 (20:32 +0000)]
Merge "Ensure that app lib symlinks are correctly labeled when created."
Stephen Smalley [Tue, 13 May 2014 16:53:07 +0000 (12:53 -0400)]
Ensure that app lib symlinks are correctly labeled when created.
At present, the app lib symlinks are created before setting
the package directory security context, and therefore default
to system_data_file. Upon a later restorecon_recursive,
they are relabeled to the same type as the package directory,
e.g. app_data_file. Avoid this inconsistency by setting the
package directory security context before creating the symlink
so that it inherits the same security context.
Change-Id: I1ee6ccd8a2aa63a4d2efda67f313c97932235911
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Greg Hackmann [Mon, 12 May 2014 18:08:13 +0000 (18:08 +0000)]
am
bd20e551: Merge "Use asynchronous lock/unlock API"
* commit '
bd20e551f64234142e1146f9fa4b2dcebbd72122':
Use asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:01:59 +0000 (18:01 +0000)]
Merge "Use asynchronous lock/unlock API"
Francis Hart [Tue, 1 Apr 2014 12:30:53 +0000 (15:30 +0300)]
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: I8c3fd9592e0c5400ac9be84450f55a77cc0bbdc5
Greg Hackmann [Fri, 9 May 2014 21:46:44 +0000 (21:46 +0000)]
am
a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '
a9d49f99e69d8fc0e60b492b131322c96f47a232':
Revert "Use asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:39:07 +0000 (21:39 +0000)]
Merge "Revert "Use asynchronous lock/unlock API""
Greg Hackmann [Fri, 9 May 2014 21:36:48 +0000 (21:36 +0000)]
Revert "Use asynchronous lock/unlock API"
This reverts commit
378ef07760eda717367d9429428c42d54d54d9a7.
Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
Greg Hackmann [Fri, 9 May 2014 21:08:39 +0000 (21:08 +0000)]
am
f60564a1: Merge "Use asynchronous lock/unlock API"
* commit '
f60564a13e917877c76c99294194a621d872076b':
Use asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:02:20 +0000 (21:02 +0000)]
Merge "Use asynchronous lock/unlock API"
Ying Wang [Wed, 7 May 2014 22:54:27 +0000 (22:54 +0000)]
am
8155ce81: Merge "Remove unused LOCAL_LDLIBS."
* commit '
8155ce81d4b150e6e453d9443f9fea4cc2c546d2':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:48:40 +0000 (22:48 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Wed, 7 May 2014 22:26:38 +0000 (15:26 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: I62904c410a66f256da8253764577acae18f964f8
Jesse Hall [Mon, 5 May 2014 22:48:50 +0000 (22:48 +0000)]
am
ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null"
* commit '
ef923fcfd3db9ca1d7df48273cf9a6258aaf15c2':
fix GraphicBuffer::flatten crash issue when handle is null
Jesse Hall [Mon, 5 May 2014 22:45:49 +0000 (22:45 +0000)]
Merge "fix GraphicBuffer::flatten crash issue when handle is null"
Jesse Hall [Mon, 5 May 2014 17:27:46 +0000 (17:27 +0000)]
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.
Jesse Hall [Mon, 5 May 2014 17:26:00 +0000 (17:26 +0000)]
Merge "Add error message for hints when exceptions occur during binder transactions."
Francis Hart [Tue, 1 Apr 2014 12:30:53 +0000 (15:30 +0300)]
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
Narayan Kamath [Thu, 1 May 2014 14:00:54 +0000 (14:00 +0000)]
am
cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit '
cb079c899ac9d9c5ec90840249821f58c817406c':
Add instruction-set arguments to installd commands.
Narayan Kamath [Thu, 1 May 2014 13:57:12 +0000 (13:57 +0000)]
Merge "Add instruction-set arguments to installd commands."
Narayan Kamath [Fri, 11 Apr 2014 12:17:00 +0000 (13:17 +0100)]
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
791781bfb8cdcdf90e32968159603e2fe5098d94)
Change-Id: I43396b16f6eaecacf0fb7d052526fc5a239167ac
Bill Yi [Tue, 29 Apr 2014 18:34:19 +0000 (11:34 -0700)]
Jun Jiang [Tue, 29 Apr 2014 06:22:10 +0000 (14:22 +0800)]
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>
Jun Jiang [Tue, 29 Apr 2014 06:15:36 +0000 (14:15 +0800)]
fix GraphicBuffer::flatten crash issue when handle is null
Change-Id: I0d3727e4366cac355791e52cb7790bf8f3c51527
Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
Brian Carlstrom [Mon, 28 Apr 2014 22:00:35 +0000 (22:00 +0000)]
Merge "Fix incorrect odex path handling"
Chih-Wei Huang [Mon, 28 Apr 2014 07:47:45 +0000 (15:47 +0800)]
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
Jesse Hall [Mon, 21 Apr 2014 18:51:18 +0000 (18:51 +0000)]
Merge "Expose core EGL entry points to eglGetProcAddress"
Colin Cross [Tue, 15 Apr 2014 02:10:51 +0000 (02:10 +0000)]
Merge "libui: fix passing Fence object over binder"
Colin Cross [Tue, 15 Apr 2014 01:43:12 +0000 (18:43 -0700)]
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
Nick Kralevich [Wed, 9 Apr 2014 19:41:26 +0000 (19:41 +0000)]
Merge "restorecon the profile directory."
Stephen Smalley [Wed, 9 Apr 2014 18:23:43 +0000 (14:23 -0400)]
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>
Greg Hackmann [Thu, 3 Apr 2014 17:07:09 +0000 (17:07 +0000)]
Merge "make struct Event layout consistent on 32/64-bit"
Glenn Kasten [Thu, 3 Apr 2014 17:00:58 +0000 (17:00 +0000)]
Merge "AArch64: Correction to OMX_U32 and OMX_S32"
Narayan Kamath [Thu, 3 Apr 2014 13:59:27 +0000 (13:59 +0000)]
Merge "Remove global variables from ProcessState."
Narayan Kamath [Fri, 28 Mar 2014 13:41:28 +0000 (13:41 +0000)]
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
Marcus Oakland [Tue, 25 Mar 2014 17:53:43 +0000 (17:53 +0000)]
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>
Glenn Kasten [Wed, 2 Apr 2014 16:15:59 +0000 (16:15 +0000)]
Merge "opengl: fix UAL conformity"
synergy dev [Mon, 24 Feb 2014 07:43:26 +0000 (23:43 -0800)]
opengl: fix UAL conformity
GAS assumes .align 2 if .align only is set, however the UAL doesn't enforce this assumption.
Change-Id: I88b567dc84ee8f04a13f2b8e80c3ee41530a9e49
Nick Kralevich [Mon, 31 Mar 2014 20:09:18 +0000 (20:09 +0000)]
Merge "Modify installd's restorecon function."
Robert Craig [Thu, 27 Mar 2014 14:21:12 +0000 (10:21 -0400)]
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>
Jesse Hall [Fri, 28 Mar 2014 04:52:09 +0000 (04:52 +0000)]
Merge "GraphicProducerWrapper may return false transact status"
Michael Chock [Mon, 27 Jan 2014 16:14:33 +0000 (08:14 -0800)]
Expose core EGL entry points to eglGetProcAddress
Required behavior for EGL_KHR_get_all_proc_addresses.
Change-Id: I1e6209ef3cb9f2fa6f22808b077c35139d4cb814
bdeng3X [Thu, 20 Mar 2014 01:15:34 +0000 (09:15 +0800)]
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>
Nick Kralevich [Wed, 26 Mar 2014 15:44:14 +0000 (15:44 +0000)]
Merge "Send libselinux logging to logcat."
Stephen Smalley [Wed, 26 Mar 2014 13:30:37 +0000 (09:30 -0400)]
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>
Xia Wang [Mon, 24 Mar 2014 18:39:57 +0000 (18:39 +0000)]
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
Xia Wang [Thu, 27 Feb 2014 02:04:50 +0000 (18:04 -0800)]
Build the benchmark test to /data/local/tmp/ for automated test
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
(cherry picked from commit
b7925f1364b56708e072884a5ae9dba2d32b58e6)