Glenn Kasten
80a2f03051
Merge "Allow creation of heaps that are read-only to partner"
2014-03-27 22:28:11 +00:00
Narayan Kamath
7289b64976
Merge "Cherry pick parts of f5df700e6ce."
2014-03-27 14:33:57 +00:00
Narayan Kamath
37764c71a0
Cherry pick parts of f5df700e6ce.
...
This is logically a part of the merge conflict resolution for
22d07464 to master. These files moved across git repositories.
Change-Id: Id95bfa0bf503295f2c02a201f4bec5243d169ec4
2014-03-27 14:27:42 +00:00
Nick Kralevich
9cddbd258d
am d9ee7dee
: am b1a8c016
: Merge "Send libselinux logging to logcat."
...
* commit 'd9ee7dee2cf42c0e672c7ac85c0252a22d3e5f08':
Send libselinux logging to logcat.
2014-03-26 16:36:38 +00:00
Nick Kralevich
d9ee7dee2c
am b1a8c016
: Merge "Send libselinux logging to logcat."
...
* commit 'b1a8c016371282a3cd3b113e6b2c0310372babf2':
Send libselinux logging to logcat.
2014-03-26 15:55:46 +00: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
Andy McFadden
f3ed9a21b8
Request RGBX rather than RGBA
...
Fixes San Angeles for certain devices.
Bug 13641473
Change-Id: Icb148e1fed15fe56297942475c095e7eb4a11549
2014-03-25 14:59:26 -07:00
Xia Wang
f3f2afd8cc
am d0d43664
: am a0da27d5
: am 9c7db080
: Build the benchmark test to /data/local/tmp/ for automated test
...
* commit 'd0d436647511a422d355e80d7ddd6a22ecf5a6f6':
Build the benchmark test to /data/local/tmp/ for automated test
2014-03-25 04:06:00 +00:00
Xia Wang
d0d4366475
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
2014-03-25 03:53:59 +00:00
Xia Wang
a0da27d546
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-25 03:46:32 +00:00
Dan Stoza
2443c7903c
BufferQueue: Set attached buffers as requested
...
When a buffer is attached to the producer side, it needs to be marked
as having been requested so that it can be queued successfully.
Change-Id: I90a88b332c415a57921bd094ae635afdf65bff99
2014-03-24 15:03:46 -07: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
Dan Stoza
5cd13e5183
Merge "BufferQueue: Test remote producer and consumer"
2014-03-24 16:17:16 +00:00
Mark Salyzyn
41d2f80739
inputflinger: 64 bit compile issues
...
Change-Id: I73c37eb19b28d987ff13632a999e71d6c96cc3e0
2014-03-21 15:34:51 -07:00
Paul Lawrence
0a32461524
batteryservice: Native client read exception returned from getProperty
...
C++ binder client for IBatteryPropertiesRegistrar interface getProperty method
fails to read the exception code returned by the server. Add the missing read of the exception code.
Bug: 11985952
Change-Id: I8a9b145160aafbcf9976e6c5ba9fcb883126a5e3
2014-03-21 19:22:37 +00:00
Dan Stoza
1a0b861790
BufferQueue: Test remote producer and consumer
...
Adds a test that puts the BufferQueue into its own process and
connects to it over remote binder interfaces. This exposed the fact
that while IGBC was technically binderized, it didn't actually work
when flattened, so this change also fixes that.
Change-Id: I728cdb662a4273ddd3440ed6040a12560313fe68
2014-03-21 11:16:54 -07:00
Marco Nelissen
b898440c99
am e4b26f20
: 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 'e4b26f20b78c6d6b63551618a80a92d325fedca5':
Add support for writing byte arrays to parcels
2014-03-20 23:12:54 +00:00
Jesse Hall
f4e7008989
am 74ae7490
: am 01502981
: Merge "fix valgrind ioctl warning."
...
* commit '74ae749099a3c84f38dbe2f43e6627bb17caf5e4':
fix valgrind ioctl warning.
2014-03-20 21:05:16 +00:00
Marco Nelissen
e4b26f20b7
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
2014-03-20 21:02:04 +00:00
Marco Nelissen
40c68757ef
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:57:13 +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
Paul Lawrence
151d24899f
Merge "batteryservice: Add battery capacity"
2014-03-20 18:11:10 +00: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
74ae749099
am 01502981
: Merge "fix valgrind ioctl warning."
...
* commit '01502981cddb69b9ab7e4bf8bc66366ae0eb7035':
fix valgrind ioctl warning.
2014-03-20 16:31:37 +00:00
Jesse Hall
01502981cd
Merge "fix valgrind ioctl warning."
2014-03-20 16:09:15 +00:00
Michael Wright
38dcdff308
Generate ACTION_CANCEL on joystick disconnect.
...
Bug: 11480300
Change-Id: I46706838eec0711c6bf345301e7b4ccbad83b063
2014-03-20 01:54:00 +00:00
Michael Wright
dcfcf5d0ae
Add idc config option for handling key repeats
...
Bug: 13285870
Change-Id: I3c1cd5fb0a02dfb3432c1f04d0eef2d4970857ea
2014-03-20 01:14:06 +00:00
Paul Lawrence
d8e1f65273
batteryservice: Add battery capacity
...
Change-Id: I6879ec9ec931cbea82aa550b3b227e744255bfd4
2014-03-19 21:56:47 +00:00
Nick Kralevich
bb9c93bb6e
am 5d58e309
: am 1bf30245
: Merge "Extend installd to support SELinux restorecon function."
...
* commit '5d58e3092d70231da57140a7d9d9fbb87fd4b8e6':
Extend installd to support SELinux restorecon function.
2014-03-19 20:41:51 +00:00
Nick Kralevich
5d58e3092d
am 1bf30245
: Merge "Extend installd to support SELinux restorecon function."
...
* commit '1bf30245cbb8be7279fadcf4071cecc8db91789f':
Extend installd to support SELinux restorecon function.
2014-03-19 20:29:27 +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
Dan Stoza
02ab322c5e
Merge "Remove deprecated BufferQueue constructor"
2014-03-19 16:32:10 +00:00
Wonsik Kim
8ce5c1cc8d
Merge "Fill in sideband stream caveat"
2014-03-19 00:41:23 +00:00
Glenn Kasten
6546f2e458
Allow creation of heaps that are read-only to partner
...
Change-Id: I3c2b3d9b1671da4b9d9c58dce27e291d30703b03
2014-03-18 15:07:43 -07:00
Dan Stoza
75555b2eaf
Merge "BufferItemConsumer: Use IGBC instead of BQ"
2014-03-18 17:55:06 +00:00
Dan Stoza
b9b088375d
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I9fe15e45daa7351f1db34ee75bfee6f19cb347d3
2014-03-18 10:08:44 -07:00
Dan Stoza
14226716f2
Merge "Remove deprecated BufferQueue constructor"
2014-03-18 16:56:15 +00:00
Andy McFadden
74d8acd7fc
Merge "Added null check"
2014-03-18 15:20:24 +00:00
Wonsik Kim
8bf3b1a496
Merge "Revert "Implement video plane layer""
2014-03-18 01:00:44 +00:00
Andy McFadden
bc96e4714f
Added null check
...
Don't dereference "handle" if it's NULL.
Bug 13348578
Change-Id: Ifa6758616c41cf84467af6db29c779d26901a01c
2014-03-17 16:48:23 -07:00
Kenny Root
75d8406934
am ca609e43
: am 38e2aaaa
: am 5b61ad2c
: Check the padded size of the read byte array
...
* commit 'ca609e4300d88ad1e815581ebc6a478b446d3882':
Check the padded size of the read byte array
2014-03-17 23:32:59 +00:00