OSDN Git Service
Adam Lesinski [Thu, 1 May 2014 21:33:56 +0000 (21:33 +0000)]
am
19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev
* commit '
19f7cd5c635b295e3e15ca2129a1f24fe9df98ec':
Remove some features from wearables
Adam Lesinski [Thu, 1 May 2014 21:30:42 +0000 (21:30 +0000)]
Merge "Remove some features from wearables" into klp-modular-dev
Adam Lesinski [Wed, 23 Apr 2014 20:19:53 +0000 (13:19 -0700)]
Remove some features from wearables
It was incorrectly assumed that these devices must require
a device admin, camera, and network location.
Change-Id: I51942ece6c0b9f824bfc3ee82917a2496ae81788
Narayan Kamath [Thu, 1 May 2014 14:05:10 +0000 (14:05 +0000)]
am
44df726a: am
cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit '
44df726a6cf4fe1119e146c9a18c78966a6305d3':
Add instruction-set arguments to installd commands.
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
Nick Vaccaro [Wed, 30 Apr 2014 20:35:15 +0000 (20:35 +0000)]
am
85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging
* commit '
85453ecc90a94564e586f0f97c9ec2c0cf831501':
dumpstate: increase poll timeout waiting for SIGQUIT logging
Nick Vaccaro [Wed, 30 Apr 2014 18:19:23 +0000 (11:19 -0700)]
dumpstate: increase poll timeout waiting for SIGQUIT logging
Increased the maximum time dumpstate will wait for SIGQUIT process
to finish dumping its thread stacks to the logfile to 5 seconds.
Bug:
14057177
Change-Id: I0b43004512855d202f2fe0ea7b0e934e77a3a070
Bill Yi [Wed, 30 Apr 2014 00:58:53 +0000 (00:58 +0000)]
Bill Yi [Tue, 29 Apr 2014 18:34:19 +0000 (11:34 -0700)]
Brian Carlstrom [Mon, 28 Apr 2014 22:06:09 +0000 (22:06 +0000)]
am
108ed9fa: Merge "Fix incorrect odex path handling"
* commit '
108ed9fa946ec516c0d853927c76ebbfca1dcb23':
Fix incorrect odex path handling
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
Dan Stoza [Wed, 23 Apr 2014 14:36:20 +0000 (14:36 +0000)]
am
f3c07d4f: Fix virtual display nesting
* commit '
f3c07d4f70f33c2fe5b14ca8fbcdfa4133cc72c7':
Fix virtual display nesting
Dan Stoza [Wed, 5 Feb 2014 00:22:36 +0000 (16:22 -0800)]
Fix virtual display nesting
This fixes the cycling rendering loop caused by nesting virtual
displays by preventing them from recomposing if their contents
haven't changed.
(cherry-pick from master I600365c0fd5d3ad93e04295d26cf9de177ffc79b)
Bug:
12101046
Change-Id: I6182993d53537781aedb522f97a50f06eed8b80f
Jesse Hall [Mon, 21 Apr 2014 18:57:12 +0000 (18:57 +0000)]
am
3f0d5669: Merge "Expose core EGL entry points to eglGetProcAddress"
* commit '
3f0d5669eb437ce1f9ce599e196d045534ec3d4f':
Expose core EGL entry points to eglGetProcAddress
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:17:28 +0000 (02:17 +0000)]
am
85085cd6: Merge "libui: fix passing Fence object over binder"
* commit '
85085cd6dd5ffed556e0a044ccf4080fbe7c5981':
libui: fix passing Fence object over binder
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
Aravind Akella [Fri, 11 Apr 2014 19:34:53 +0000 (19:34 +0000)]
am
cf818ebb: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
* commit '
cf818ebbf07c6a20ef48d71bf82f8d4bdf3a398c':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
Aravind Akella [Fri, 11 Apr 2014 19:32:28 +0000 (19:32 +0000)]
Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
Jeff Brown [Fri, 11 Apr 2014 03:53:32 +0000 (03:53 +0000)]
am
db19e463: Remove unnecessary policy flags.
* commit '
db19e463fe5a4e00a0214c564527ba67f31e1afb':
Remove unnecessary policy flags.
Aravind Akella [Mon, 7 Apr 2014 22:52:37 +0000 (22:52 +0000)]
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
This reverts commit
4369a4ebd5ae7567e7075bc82830b83178099ed5.
Change-Id: Ifa8619cc6873470a07a987763d818d78d4232610
Jeff Brown [Wed, 9 Apr 2014 02:55:38 +0000 (19:55 -0700)]
Remove unnecessary policy flags.
Bug:
13133142
Change-Id: Ib6c63ebad25d84f78623b4a46ccf83953d235fe7
Nick Kralevich [Wed, 9 Apr 2014 19:46:14 +0000 (19:46 +0000)]
am
82fb5809: Merge "restorecon the profile directory."
* commit '
82fb58095524c833b0470c4b236aa8a70acf2a0f':
restorecon the profile directory.
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>
Andy McFadden [Mon, 7 Apr 2014 16:52:13 +0000 (16:52 +0000)]
am
6dbcebd0: Merge "Always release a buffer" into klp-modular-dev
* commit '
6dbcebd0430e026fd5d99ba4b4f005bfaa9b8e2b':
Always release a buffer
Andy McFadden [Mon, 7 Apr 2014 16:46:37 +0000 (16:46 +0000)]
Merge "Always release a buffer" into klp-modular-dev
Etienne Le Grand [Sat, 5 Apr 2014 09:06:00 +0000 (09:06 +0000)]
am
4369a4eb: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
* commit '
4369a4ebd5ae7567e7075bc82830b83178099ed5':
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
Etienne Le Grand [Sat, 5 Apr 2014 05:02:22 +0000 (05:02 +0000)]
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
This reverts commit
c57a019e117117c5a76c772970b26cd0f5db8c6a.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
Etienne Le Grand [Sat, 5 Apr 2014 01:52:28 +0000 (01:52 +0000)]
am
c57a019e: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
* commit '
c57a019e117117c5a76c772970b26cd0f5db8c6a':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
Etienne Le Grand [Tue, 25 Mar 2014 04:28:23 +0000 (21:28 -0700)]
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
Change-Id: If0f3dbdb5d2e9378e1fed4614baee4e750d0c850
Andy McFadden [Fri, 4 Apr 2014 22:37:08 +0000 (15:37 -0700)]
Always release a buffer
In GLConsumer's updateAndReleaseLocked(), we must release either
the previously-acquired buffer or the newly-acquired buffer.
Bug
13755224
Change-Id: I96adc255400ed008ba6e6ac1725ab3514c7cc8ba
John Spurlock [Fri, 4 Apr 2014 19:28:07 +0000 (19:28 +0000)]
am
ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
* commit '
ad98ad0493625578f19c727576d02725b82f927c':
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
Greg Hackmann [Fri, 4 Apr 2014 00:08:11 +0000 (00:08 +0000)]
am
27f8840f: Merge "make struct Event layout consistent on 32/64-bit"
* commit '
27f8840f228abfe5e2458a261ce5403871495a54':
make struct Event layout consistent on 32/64-bit
John Spurlock [Thu, 3 Apr 2014 20:39:17 +0000 (16:39 -0400)]
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
Bug:
13395758
Change-Id: Iecdae299bfd030f86145d02fa7860374b5a40a74
Glenn Kasten [Thu, 3 Apr 2014 17:14:50 +0000 (17:14 +0000)]
am
d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
* commit '
d2f7633277dd13ac269adb51c4e7a85746e6c599':
AArch64: Correction to OMX_U32 and OMX_S32
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 14:11:31 +0000 (14:11 +0000)]
am
033bdd72: Merge "Remove global variables from ProcessState."
* commit '
033bdd72f9f32f4bd3d282750bdc0dcfbb469959':
Remove global variables from ProcessState.
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:24:06 +0000 (16:24 +0000)]
am
17b5ca1e: Merge "opengl: fix UAL conformity"
* commit '
17b5ca1e665a1bbe17387b36fcce8f6b52513d5e':
opengl: fix UAL conformity
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
Jeff Tinker [Tue, 1 Apr 2014 22:00:44 +0000 (22:00 +0000)]
am
98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
* commit '
98e5bf2cc0931fc4e4d88b3f64069bd200690be0':
Support CAST V2 Authentication in MediaDrm
Jeff Tinker [Tue, 1 Apr 2014 21:54:35 +0000 (21:54 +0000)]
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
Nick Kralevich [Mon, 31 Mar 2014 20:20:44 +0000 (20:20 +0000)]
am
3ebb877e: Merge "Modify installd\'s restorecon function."
* commit '
3ebb877e52a2661de56c3f44827f33824e735730':
Modify installd's restorecon function.
Nick Kralevich [Mon, 31 Mar 2014 20:09:18 +0000 (20:09 +0000)]
Merge "Modify installd's restorecon function."
Jeff Tinker [Tue, 4 Mar 2014 21:23:56 +0000 (13:23 -0800)]
Support CAST V2 Authentication in MediaDrm
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: Ic38f0e1484b1388dd87f4591c74984cb724d50e2
related-to-bug:
12702350
Michael Wright [Fri, 28 Mar 2014 19:37:39 +0000 (19:37 +0000)]
am
773585e6: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
* commit '
773585e60c2e6c3e39f9f56d0d3b05eeae6dff04':
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
Michael Wright [Fri, 28 Mar 2014 19:33:35 +0000 (19:33 +0000)]
Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
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 08:50:09 +0000 (08:50 +0000)]
am
50ef8562: Merge "GraphicProducerWrapper may return false transact status"
* commit '
50ef8562fe7289495ad8592226f3c4d546119892':
GraphicProducerWrapper may return false transact status
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:55:46 +0000 (15:55 +0000)]
am
b1a8c016: Merge "Send libselinux logging to logcat."
* commit '
b1a8c016371282a3cd3b113e6b2c0310372babf2':
Send libselinux logging to logcat.
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 [Tue, 25 Mar 2014 03:53:59 +0000 (03:53 +0000)]
am
a0da27d5: am
9c7db080: Build the benchmark test to /data/local/tmp/ for automated test
* commit '
a0da27d546865d075322c410121e9c3101cec449':
Build the benchmark test to /data/local/tmp/ for automated test
Xia Wang [Tue, 25 Mar 2014 03:46:32 +0000 (03:46 +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
Michael Wright [Wed, 19 Mar 2014 19:06:10 +0000 (12:06 -0700)]
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
Bug:
11480300
Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f
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)
Marco Nelissen [Thu, 20 Mar 2014 21:02:04 +0000 (21:02 +0000)]
am
40c68757: 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 '
40c68757ef51d270174103f31a39a7d268bab3e2':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:57:13 +0000 (20:57 +0000)]
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
Marco Nelissen [Thu, 20 Mar 2014 20:56:52 +0000 (20:56 +0000)]
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
Marco Nelissen [Thu, 20 Mar 2014 20:48:45 +0000 (20:48 +0000)]
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
Marco Nelissen [Thu, 20 Mar 2014 20:26:08 +0000 (13:26 -0700)]
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
Marco Nelissen [Thu, 20 Mar 2014 20:13:23 +0000 (13:13 -0700)]
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
Marco Nelissen [Thu, 20 Mar 2014 18:11:18 +0000 (11:11 -0700)]
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
Marco Nelissen [Thu, 20 Mar 2014 18:06:54 +0000 (11:06 -0700)]
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
Marco Nelissen [Thu, 20 Mar 2014 17:55:05 +0000 (10:55 -0700)]
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
Marco Nelissen [Thu, 20 Mar 2014 17:48:35 +0000 (10:48 -0700)]
am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
e23f8b8f0bf32e79c1d0f9183c064ab61354c452':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:33:12 +0000 (10:33 -0700)]
am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
1f70863d13668dc97047df15cce547ebc8435ff2':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:04:42 +0000 (10:04 -0700)]
am
37b44969: Add support for writing byte arrays to parcels
* commit '
37b44969c0ca1d00e213da685dfbb2807f2bab30':
Add support for writing byte arrays to parcels
Jesse Hall [Thu, 20 Mar 2014 16:31:37 +0000 (16:31 +0000)]
am
01502981: Merge "fix valgrind ioctl warning."
* commit '
01502981cddb69b9ab7e4bf8bc66366ae0eb7035':
fix valgrind ioctl warning.
Jesse Hall [Thu, 20 Mar 2014 16:31:17 +0000 (16:31 +0000)]
am
01502981: Merge "fix valgrind ioctl warning."
* commit '
01502981cddb69b9ab7e4bf8bc66366ae0eb7035':
fix valgrind ioctl warning.
Jesse Hall [Thu, 20 Mar 2014 16:09:14 +0000 (16:09 +0000)]
Merge "fix valgrind ioctl warning."
Fengwei Yin [Thu, 20 Mar 2014 08:45:05 +0000 (16:45 +0800)]
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>
Nick Kralevich [Wed, 19 Mar 2014 20:29:46 +0000 (20:29 +0000)]
am
1bf30245: Merge "Extend installd to support SELinux restorecon function."
* commit '
1bf30245cbb8be7279fadcf4071cecc8db91789f':
Extend installd to support SELinux restorecon function.
Nick Kralevich [Wed, 19 Mar 2014 20:29:27 +0000 (20:29 +0000)]
am
1bf30245: Merge "Extend installd to support SELinux restorecon function."
* commit '
1bf30245cbb8be7279fadcf4071cecc8db91789f':
Extend installd to support SELinux restorecon function.
Nick Kralevich [Wed, 19 Mar 2014 20:17:24 +0000 (20:17 +0000)]
Merge "Extend installd to support SELinux restorecon function."
Robert Craig [Thu, 20 Feb 2014 15:25:56 +0000 (10:25 -0500)]
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>
Kenny Root [Mon, 17 Mar 2014 21:31:04 +0000 (21:31 +0000)]
am
38e2aaaa: am
5b61ad2c: Check the padded size of the read byte array
* commit '
38e2aaaa3dd62a20eb211808ae6fe45ec37ee6d5':
Check the padded size of the read byte array
Kenny Root [Mon, 17 Mar 2014 21:28:34 +0000 (21:28 +0000)]
am
5b61ad2c: Check the padded size of the read byte array
* commit '
5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
Kenny Root [Mon, 17 Mar 2014 21:28:33 +0000 (21:28 +0000)]
am
5b61ad2c: Check the padded size of the read byte array
* commit '
5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
Kenny Root [Mon, 17 Mar 2014 20:18:16 +0000 (13:18 -0700)]
Check the padded size of the read byte array
Bug:
13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
Adam Lesinski [Mon, 17 Mar 2014 19:52:35 +0000 (19:52 +0000)]
am
7cd122a5: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
* commit '
7cd122a549831611ce79389e481484ade16744f1':
Add device admin to wearables for API8 Compat
Adam Lesinski [Mon, 17 Mar 2014 19:52:34 +0000 (19:52 +0000)]
am
fc34b7b7: Merge "Remove accessibility as an optional feature" into klp-modular-dev
* commit '
fc34b7b7fc9749a3fb1f8e7d924274a5768366aa':
Remove accessibility as an optional feature
Adam Lesinski [Mon, 17 Mar 2014 19:50:56 +0000 (19:50 +0000)]
Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:50:30 +0000 (19:50 +0000)]
Merge "Remove accessibility as an optional feature" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:17:29 +0000 (12:17 -0700)]
Add device admin to wearables for API8 Compat
Bug:
13386441
Change-Id: I8814976db791bb1f2e60b6a9fc49afdd5f360414
Adam Lesinski [Mon, 17 Mar 2014 19:14:26 +0000 (12:14 -0700)]
Remove accessibility as an optional feature
Bug:
13439904
Change-Id: Icc6b84d05a24cbfdaa121929e7c7c77c0f7eed17
Marco Nelissen [Thu, 13 Mar 2014 21:17:40 +0000 (14:17 -0700)]
Add support for writing byte arrays to parcels
b/
13418320
Cherrypicked from
f0190bff38b6c29abbfc4a877442f71fc3d7dad8
https://googleplex-android-review.git.corp.google.com/#/c/433320/
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
OSDN Git Service
