Ruchi Kandoi
ca13fa7dd4
PowerManager: add powerHint binder method
...
Change-Id: Ide1d50bb1580698b25296fbfc1cc63c3b21a00bc
2014-04-02 21:24:01 +00:00
Glenn Kasten
e6ef753ef6
am fc1544d5
: am 17b5ca1e
: Merge "opengl: fix UAL conformity"
...
* commit 'fc1544d52d1232ccdf57a05704a013bad784f8f6':
opengl: fix UAL conformity
2014-04-02 16:27:10 +00:00
Glenn Kasten
fc1544d52d
am 17b5ca1e
: Merge "opengl: fix UAL conformity"
...
* commit '17b5ca1e665a1bbe17387b36fcce8f6b52513d5e':
opengl: fix UAL conformity
2014-04-02 16:24:06 +00:00
Glenn Kasten
17b5ca1e66
Merge "opengl: fix UAL conformity"
2014-04-02 16:15:59 +00:00
Wonsik Kim
9cfa49c954
Merge "Declare ownership of native_handle_t object"
2014-04-02 06:13:57 +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
Jeff Tinker
60a6337de0
am b2f414fb
: am 98e5bf2c
: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
...
* commit 'b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b':
Support CAST V2 Authentication in MediaDrm
2014-04-01 22:23:23 +00:00
Jeff Tinker
b2f414fbd6
am 98e5bf2c
: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
...
* commit '98e5bf2cc0931fc4e4d88b3f64069bd200690be0':
Support CAST V2 Authentication in MediaDrm
2014-04-01 22:00:44 +00:00
Jeff Tinker
98e5bf2cc0
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
2014-04-01 21:54:35 +00:00
Nick Kralevich
96668903e4
am 4b3d6e31
: am 3ebb877e
: Merge "Modify installd\'s restorecon function."
...
* commit '4b3d6e310016140026b0b6c9dca757bf37d6d26a':
Modify installd's restorecon function.
2014-03-31 20:26:29 +00:00
Nick Kralevich
4b3d6e3100
am 3ebb877e
: Merge "Modify installd\'s restorecon function."
...
* commit '3ebb877e52a2661de56c3f44827f33824e735730':
Modify installd's restorecon function.
2014-03-31 20:20:44 +00:00
Nick Kralevich
3ebb877e52
Merge "Modify installd's restorecon function."
2014-03-31 20:09:18 +00:00
Jeff Tinker
c2f10f20ec
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
2014-03-29 08:41:39 -07:00
Michael Wright
c06283bb8b
am 6c4e2d81
: (-s ours) am 773585e6
: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
...
* commit '6c4e2d816b244c46baac53cbe638ac87be703859':
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
2014-03-28 19:42:39 +00:00
Michael Wright
6c4e2d816b
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
2014-03-28 19:37:39 +00:00
Michael Wright
773585e60c
Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
2014-03-28 19:33:36 +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
8b834ffd9b
am 1b751203
: am 50ef8562
: Merge "GraphicProducerWrapper may return false transact status"
...
* commit '1b7512036f3ea55cb1f62777ba6e56aad781f11c':
GraphicProducerWrapper may return false transact status
2014-03-28 09:02:02 +00:00
Jesse Hall
1b7512036f
am 50ef8562
: Merge "GraphicProducerWrapper may return false transact status"
...
* commit '50ef8562fe7289495ad8592226f3c4d546119892':
GraphicProducerWrapper may return false transact status
2014-03-28 08:50:09 +00:00
Jesse Hall
50ef8562fe
Merge "GraphicProducerWrapper may return false transact status"
2014-03-28 04:52:10 +00:00
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
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
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
Michael Wright
d0bd391146
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
...
Bug: 11480300
Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f
2014-03-24 17:26:52 -07: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
Wonsik Kim
0ec54e156b
Declare ownership of native_handle_t object
...
Change-Id: I4e21ff8ea76cfafce943dc059c8f72b42397980e
2014-03-24 15:44:05 +09: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