OSDN Git Service

android-x86/frameworks-native.git
10 years agoam b2f414fb: am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into...
Jeff Tinker [Tue, 1 Apr 2014 22:23:23 +0000 (22:23 +0000)]
am b2f414fb: am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev

* commit 'b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b':
  Support CAST V2 Authentication in MediaDrm

10 years agoam 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
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

10 years agoMerge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
Jeff Tinker [Tue, 1 Apr 2014 21:54:35 +0000 (21:54 +0000)]
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev

10 years agoam 4b3d6e31: am 3ebb877e: Merge "Modify installd\'s restorecon function."
Nick Kralevich [Mon, 31 Mar 2014 20:26:29 +0000 (20:26 +0000)]
am 4b3d6e31: am 3ebb877e: Merge "Modify installd\'s restorecon function."

* commit '4b3d6e310016140026b0b6c9dca757bf37d6d26a':
  Modify installd's restorecon function.

10 years agoam 3ebb877e: Merge "Modify installd\'s restorecon function."
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.

10 years agoMerge "Modify installd's restorecon function."
Nick Kralevich [Mon, 31 Mar 2014 20:09:18 +0000 (20:09 +0000)]
Merge "Modify installd's restorecon function."

10 years agoSupport CAST V2 Authentication in MediaDrm
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

10 years agoam 6c4e2d81: (-s ours) am 773585e6: Merge "Generate ACTION_CANCEL on joystick disconn...
Michael Wright [Fri, 28 Mar 2014 19:42:39 +0000 (19:42 +0000)]
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

10 years agoam 773585e6: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE"...
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

10 years agoMerge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
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

10 years agoModify 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>
10 years agoam 1b751203: am 50ef8562: Merge "GraphicProducerWrapper may return false transact...
Jesse Hall [Fri, 28 Mar 2014 09:02:02 +0000 (09:02 +0000)]
am 1b751203: am 50ef8562: Merge "GraphicProducerWrapper may return false transact status"

* commit '1b7512036f3ea55cb1f62777ba6e56aad781f11c':
  GraphicProducerWrapper may return false transact status

10 years agoam 50ef8562: Merge "GraphicProducerWrapper may return false transact status"
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

10 years agoMerge "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"

10 years agoMerge "Allow creation of heaps that are read-only to partner"
Glenn Kasten [Thu, 27 Mar 2014 22:28:09 +0000 (22:28 +0000)]
Merge "Allow creation of heaps that are read-only to partner"

10 years agoMerge "Cherry pick parts of f5df700e6ce."
Narayan Kamath [Thu, 27 Mar 2014 14:33:57 +0000 (14:33 +0000)]
Merge "Cherry pick parts of f5df700e6ce."

10 years agoCherry pick parts of f5df700e6ce.
Narayan Kamath [Thu, 27 Mar 2014 14:21:09 +0000 (14:21 +0000)]
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

10 years agoGraphicProducerWrapper may return false transact status
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>
10 years agoam d9ee7dee: am b1a8c016: Merge "Send libselinux logging to logcat."
Nick Kralevich [Wed, 26 Mar 2014 16:36:38 +0000 (16:36 +0000)]
am d9ee7dee: am b1a8c016: Merge "Send libselinux logging to logcat."

* commit 'd9ee7dee2cf42c0e672c7ac85c0252a22d3e5f08':
  Send libselinux logging to logcat.

10 years agoam b1a8c016: Merge "Send libselinux logging to logcat."
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.

10 years agoMerge "Send libselinux logging to logcat."
Nick Kralevich [Wed, 26 Mar 2014 15:44:14 +0000 (15:44 +0000)]
Merge "Send libselinux logging to logcat."

10 years agoSend 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>
10 years agoRequest RGBX rather than RGBA
Andy McFadden [Tue, 25 Mar 2014 21:59:26 +0000 (14:59 -0700)]
Request RGBX rather than RGBA

Fixes San Angeles for certain devices.

Bug 13641473

Change-Id: Icb148e1fed15fe56297942475c095e7eb4a11549

10 years agoam d0d43664: am a0da27d5: am 9c7db080: Build the benchmark test to /data/local/tmp...
Xia Wang [Tue, 25 Mar 2014 04:06:00 +0000 (04:06 +0000)]
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

10 years agoam a0da27d5: am 9c7db080: Build the benchmark test to /data/local/tmp/ for automated...
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

10 years agoam 9c7db080: 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

10 years agoGenerate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
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

10 years agoBufferQueue: Set attached buffers as requested
Dan Stoza [Mon, 24 Mar 2014 22:03:46 +0000 (15:03 -0700)]
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

10 years agoBuild 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)

10 years agoMerge "BufferQueue: Test remote producer and consumer"
Dan Stoza [Mon, 24 Mar 2014 16:17:16 +0000 (16:17 +0000)]
Merge "BufferQueue: Test remote producer and consumer"

10 years agoinputflinger: 64 bit compile issues
Mark Salyzyn [Tue, 18 Mar 2014 17:59:23 +0000 (10:59 -0700)]
inputflinger: 64 bit compile issues

Change-Id: I73c37eb19b28d987ff13632a999e71d6c96cc3e0

10 years agobatteryservice: Native client read exception returned from getProperty
Paul Lawrence [Wed, 19 Mar 2014 21:47:29 +0000 (14:47 -0700)]
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

10 years agoBufferQueue: Test remote producer and consumer
Dan Stoza [Thu, 20 Mar 2014 22:36:31 +0000 (15:36 -0700)]
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

10 years agoam e4b26f20: am 40c68757: am 897fe45c: am 23c2fcbb: (-s ours) am c0af9caf: am b14d72b...
Marco Nelissen [Thu, 20 Mar 2014 23:12:54 +0000 (23:12 +0000)]
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

10 years agoam 74ae7490: am 01502981: Merge "fix valgrind ioctl warning."
Jesse Hall [Thu, 20 Mar 2014 21:05:16 +0000 (21:05 +0000)]
am 74ae7490: am 01502981: Merge "fix valgrind ioctl warning."

* commit '74ae749099a3c84f38dbe2f43e6627bb17caf5e4':
  fix valgrind ioctl warning.

10 years agoam 40c68757: am 897fe45c: am 23c2fcbb: (-s ours) am c0af9caf: am b14d72bc: am d070009...
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

10 years agoam 897fe45c: am 23c2fcbb: (-s ours) am c0af9caf: am b14d72bc: am d070009e: am df6774c...
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

10 years agoam 23c2fcbb: (-s ours) am c0af9caf: am b14d72bc: am d070009e: am df6774c9: am 7c1cdbd...
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

10 years agoam c0af9caf: am b14d72bc: am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am...
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

10 years agoam b14d72bc: am d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am...
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

10 years agoam d070009e: am df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add...
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

10 years agoMerge "batteryservice: Add battery capacity"
Paul Lawrence [Thu, 20 Mar 2014 18:11:10 +0000 (18:11 +0000)]
Merge "batteryservice: Add battery capacity"

10 years agoam df6774c9: am 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for...
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

10 years agoam 7c1cdbdd: am e23f8b8f: am 1f70863d: am 37b44969: Add support for writing byte...
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

10 years agoam e23f8b8f: am 1f70863d: am 37b44969: 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

10 years agoam 1f70863d: am 37b44969: 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

10 years agoam 37b44969: 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

10 years agoam 01502981: Merge "fix valgrind ioctl warning."
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.

10 years agoMerge "fix valgrind ioctl warning."
Jesse Hall [Thu, 20 Mar 2014 16:09:14 +0000 (16:09 +0000)]
Merge "fix valgrind ioctl warning."

10 years agoGenerate ACTION_CANCEL on joystick disconnect.
Michael Wright [Wed, 19 Mar 2014 19:06:10 +0000 (12:06 -0700)]
Generate ACTION_CANCEL on joystick disconnect.

Bug: 11480300
Change-Id: I46706838eec0711c6bf345301e7b4ccbad83b063

10 years agoAdd idc config option for handling key repeats
Michael Wright [Mon, 17 Mar 2014 19:58:21 +0000 (12:58 -0700)]
Add idc config option for handling key repeats

Bug: 13285870
Change-Id: I3c1cd5fb0a02dfb3432c1f04d0eef2d4970857ea

10 years agobatteryservice: Add battery capacity
Paul Lawrence [Mon, 3 Mar 2014 21:43:20 +0000 (13:43 -0800)]
batteryservice: Add battery capacity

Change-Id: I6879ec9ec931cbea82aa550b3b227e744255bfd4

10 years agoam 5d58e309: am 1bf30245: Merge "Extend installd to support SELinux restorecon function."
Nick Kralevich [Wed, 19 Mar 2014 20:41:51 +0000 (20:41 +0000)]
am 5d58e309: am 1bf30245: Merge "Extend installd to support SELinux restorecon function."

* commit '5d58e3092d70231da57140a7d9d9fbb87fd4b8e6':
  Extend installd to support SELinux restorecon function.

10 years agoam 1bf30245: Merge "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.

10 years agoMerge "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."

10 years agoExtend 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>
10 years agoMerge "Remove deprecated BufferQueue constructor"
Dan Stoza [Wed, 19 Mar 2014 16:32:10 +0000 (16:32 +0000)]
Merge "Remove deprecated BufferQueue constructor"

10 years agoMerge "Fill in sideband stream caveat"
Wonsik Kim [Wed, 19 Mar 2014 00:41:23 +0000 (00:41 +0000)]
Merge "Fill in sideband stream caveat"

10 years agoAllow creation of heaps that are read-only to partner
Glenn Kasten [Fri, 14 Mar 2014 23:49:51 +0000 (16:49 -0700)]
Allow creation of heaps that are read-only to partner

Change-Id: I3c2b3d9b1671da4b9d9c58dce27e291d30703b03

10 years agoMerge "BufferItemConsumer: Use IGBC instead of BQ"
Dan Stoza [Tue, 18 Mar 2014 17:55:06 +0000 (17:55 +0000)]
Merge "BufferItemConsumer: Use IGBC instead of BQ"

10 years agoRemove deprecated BufferQueue constructor
Dan Stoza [Thu, 13 Mar 2014 18:55:57 +0000 (11:55 -0700)]
Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: I9fe15e45daa7351f1db34ee75bfee6f19cb347d3

10 years agoMerge "Remove deprecated BufferQueue constructor"
Dan Stoza [Tue, 18 Mar 2014 16:56:14 +0000 (16:56 +0000)]
Merge "Remove deprecated BufferQueue constructor"

10 years agoMerge "Added null check"
Andy McFadden [Tue, 18 Mar 2014 15:20:23 +0000 (15:20 +0000)]
Merge "Added null check"

10 years agoMerge "Revert "Implement video plane layer""
Wonsik Kim [Tue, 18 Mar 2014 01:00:44 +0000 (01:00 +0000)]
Merge "Revert "Implement video plane layer""

10 years agoAdded null check
Andy McFadden [Mon, 17 Mar 2014 23:48:23 +0000 (16:48 -0700)]
Added null check

Don't dereference "handle" if it's NULL.

Bug 13348578

Change-Id: Ifa6758616c41cf84467af6db29c779d26901a01c

10 years agoam ca609e43: am 38e2aaaa: am 5b61ad2c: Check the padded size of the read byte array
Kenny Root [Mon, 17 Mar 2014 23:32:59 +0000 (23:32 +0000)]
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

10 years agoam 80acb20c: am 7cd122a5: Merge "Add device admin to wearables for API8 Compat" into...
Adam Lesinski [Mon, 17 Mar 2014 23:32:28 +0000 (23:32 +0000)]
am 80acb20c: am 7cd122a5: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev

* commit '80acb20ca95da161fc739abac0fb9084a76e2ced':
  Add device admin to wearables for API8 Compat

10 years agoam aa89a914: am fc34b7b7: Merge "Remove accessibility as an optional feature" into...
Adam Lesinski [Mon, 17 Mar 2014 23:32:27 +0000 (23:32 +0000)]
am aa89a914: am fc34b7b7: Merge "Remove accessibility as an optional feature" into klp-modular-dev

* commit 'aa89a914825a79e535917c2f0da6cad1d1ed9f2d':
  Remove accessibility as an optional feature

10 years agoam 38e2aaaa: am 5b61ad2c: Check the padded size of the read byte array
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

10 years agoam 5b61ad2c: 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

10 years agoCheck 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

10 years agoam 7cd122a5: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
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

10 years agoam fc34b7b7: Merge "Remove accessibility as an optional feature" into klp-modular-dev
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

10 years agoMerge "Add device admin to wearables for API8 Compat" into klp-modular-dev
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

10 years agoMerge "Remove accessibility as an optional feature" 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

10 years agoAdd device admin to wearables for API8 Compat
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

10 years agoRemove accessibility as an optional feature
Adam Lesinski [Mon, 17 Mar 2014 19:14:26 +0000 (12:14 -0700)]
Remove accessibility as an optional feature

Bug:13439904
Change-Id: Icc6b84d05a24cbfdaa121929e7c7c77c0f7eed17

10 years agoMerge "Remove deprecated BufferQueue constructor"
Dan Stoza [Mon, 17 Mar 2014 18:46:14 +0000 (18:46 +0000)]
Merge "Remove deprecated BufferQueue constructor"

10 years agoAdd support for writing byte arrays to parcels
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

10 years agoRevert "Implement video plane layer"
Wonsik Kim [Mon, 17 Mar 2014 11:17:28 +0000 (11:17 +0000)]
Revert "Implement video plane layer"

This reverts commit f837c93a1b392dbc4f7099d0c4fb723e32ca438e.

Change-Id: I6a1aa9ad0aca023267dc53d19c950b1535123ca7

10 years agoFill in sideband stream caveat
Wonsik Kim [Mon, 17 Mar 2014 08:46:53 +0000 (17:46 +0900)]
Fill in sideband stream caveat

Change-Id: I20db8aea8f13acf31b42db08d90b338da8a5209c

10 years agoam 793be12c: am b730a452: am f0190bff: Add support for writing byte arrays to parcels
Marco Nelissen [Sat, 15 Mar 2014 00:30:46 +0000 (00:30 +0000)]
am 793be12c: am b730a452: am f0190bff: Add support for writing byte arrays to parcels

* commit '793be12c0f5a7878d1085e94e58a9c36c84f0911':
  Add support for writing byte arrays to parcels

10 years agoam b730a452: am f0190bff: Add support for writing byte arrays to parcels
Marco Nelissen [Fri, 14 Mar 2014 23:33:08 +0000 (23:33 +0000)]
am b730a452: am f0190bff: Add support for writing byte arrays to parcels

* commit 'b730a45216991cf22c39451c47393b4bccae111b':
  Add support for writing byte arrays to parcels

10 years agoam f0190bff: Add support for writing byte arrays to parcels
Marco Nelissen [Fri, 14 Mar 2014 22:55:54 +0000 (22:55 +0000)]
am f0190bff: Add support for writing byte arrays to parcels

* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
  Add support for writing byte arrays to parcels

10 years agoam d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
Mark Salyzyn [Thu, 13 Mar 2014 23:12:09 +0000 (23:12 +0000)]
am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"

* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
  native frameworks: 64-bit compile issues

10 years agoFix broken build for more tests
Jesse Hall [Thu, 13 Mar 2014 22:09:17 +0000 (15:09 -0700)]
Fix broken build for more tests

Change-Id: I7bdd12a833233724805d01d993541ee05caa9bf6

10 years agoFix broken test build
Jesse Hall [Thu, 13 Mar 2014 21:34:28 +0000 (14:34 -0700)]
Fix broken test build

Change-Id: I767bcefd92899334e4769dd3495595f546133694

10 years agoAdd support for writing byte arrays to parcels
Marco Nelissen [Thu, 13 Mar 2014 21:17:40 +0000 (14:17 -0700)]
Add support for writing byte arrays to parcels

b/13418320

Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d

10 years agoMerge "Add sideband streams to BufferQueue and related classes"
Jesse Hall [Thu, 13 Mar 2014 20:28:16 +0000 (20:28 +0000)]
Merge "Add sideband streams to BufferQueue and related classes"

10 years agoRemove deprecated BufferQueue constructor
Dan Stoza [Thu, 13 Mar 2014 18:39:09 +0000 (11:39 -0700)]
Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: I52f58a4d22296d9fc3cdbd4ad53eb10a785db3ce

10 years agoRemove deprecated BufferQueue constructor
Dan Stoza [Thu, 13 Mar 2014 18:31:43 +0000 (11:31 -0700)]
Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: I1c17833511b5961af5a9bbb9cc3d627ce558d424

10 years agoBufferItemConsumer: Use IGBC instead of BQ
Dan Stoza [Wed, 12 Mar 2014 21:32:29 +0000 (14:32 -0700)]
BufferItemConsumer: Use IGBC instead of BQ

Change-Id: Id1756ac62954ba412f2c23c5fa6e5d760c299347

10 years agoam cdbf28b3: Merge "native frameworks: 64-bit compile issues"
Mark Salyzyn [Thu, 13 Mar 2014 15:26:10 +0000 (15:26 +0000)]
am cdbf28b3: Merge "native frameworks: 64-bit compile issues"

* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
  native frameworks: 64-bit compile issues

10 years agoMerge "native frameworks: 64-bit compile issues"
Mark Salyzyn [Thu, 13 Mar 2014 15:20:44 +0000 (15:20 +0000)]
Merge "native frameworks: 64-bit compile issues"

10 years agoam ffd353a7: (-s ours) am d9e113f0: b/12068020 add nonce to InputDeviceDescriptor...
RoboErik [Wed, 12 Mar 2014 23:04:49 +0000 (23:04 +0000)]
am ffd353a7: (-s ours) am d9e113f0: b/12068020 add nonce to InputDeviceDescriptor. Do not merge

* commit 'ffd353a73eb7794ef556c4e646f866b580a03abb':
  b/12068020 add nonce to InputDeviceDescriptor. Do not merge

10 years agoMerge "Controllers must have buttons and a movement mechanism."
Michael Wright [Wed, 12 Mar 2014 21:56:24 +0000 (21:56 +0000)]
Merge "Controllers must have buttons and a movement mechanism."

10 years agoam d9e113f0: b/12068020 add nonce to InputDeviceDescriptor. Do not merge
RoboErik [Wed, 12 Mar 2014 21:12:28 +0000 (21:12 +0000)]
am d9e113f0: b/12068020 add nonce to InputDeviceDescriptor. Do not merge

* commit 'd9e113f0e0feac1a801f8339d2f907302bd432c5':
  b/12068020 add nonce to InputDeviceDescriptor. Do not merge

10 years agonative frameworks: 64-bit compile issues
Mark Salyzyn [Wed, 12 Mar 2014 20:12:44 +0000 (13:12 -0700)]
native frameworks: 64-bit compile issues

- Fix format (print/scanf)
- Suppress unused argument warning messages (bonus)

Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728

10 years agoam 85864b87: am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."
Anwar Ghuloum [Wed, 12 Mar 2014 19:57:05 +0000 (19:57 +0000)]
am 85864b87: am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."

* commit '85864b8724b3908d2f5aa861276ce5e80d7f820e':
  Fix parameter ordering for installd's dex2oat execl.

10 years agoam d0f7ce45: (-s ours) am 9b04f860: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
Michael Wright [Wed, 12 Mar 2014 19:56:40 +0000 (19:56 +0000)]
am d0f7ce45: (-s ours) am 9b04f860: Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE

* commit 'd0f7ce457c59d5f50b0fefc0fe768fad564d0c7e':
  Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE