OSDN Git Service

android-x86/frameworks-native.git
10 years agoMerge "atrace: Add f2fs sync and ext4 write tracepoints."
Mohamad Ayyash [Tue, 15 Apr 2014 22:10:09 +0000 (22:10 +0000)]
Merge "atrace: Add f2fs sync and ext4 write tracepoints."

10 years agoam b8ceeb8f: am 85085cd6: Merge "libui: fix passing Fence object over binder"
Colin Cross [Tue, 15 Apr 2014 20:52:27 +0000 (20:52 +0000)]
am b8ceeb8f: am 85085cd6: Merge "libui: fix passing Fence object over binder"

* commit 'b8ceeb8f6cc3eea53d4b471747c401b9ae54d931':
  libui: fix passing Fence object over binder

10 years agoam 85085cd6: Merge "libui: fix passing Fence object over binder"
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

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

10 years agolibui: 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

10 years agoMerge "BufferQueue: Hook up IProducerListener"
Dan Stoza [Mon, 14 Apr 2014 16:26:42 +0000 (16:26 +0000)]
Merge "BufferQueue: Hook up IProducerListener"

10 years agoatrace: Add f2fs sync and ext4 write tracepoints.
Mohamad Ayyash [Tue, 8 Apr 2014 22:24:11 +0000 (15:24 -0700)]
atrace: Add f2fs sync and ext4 write tracepoints.

Change-Id: I76fa32f7d80aaeafc26494d9018b7a004e7dc3d2

10 years agoam ef89f763: am cf818ebb: Merge "Add stringType and requiredPermission to sensors...
Aravind Akella [Fri, 11 Apr 2014 19:40:33 +0000 (19:40 +0000)]
am ef89f763: am cf818ebb: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev

* commit 'ef89f7638c43ce5f73e32d487bf65c3375995e3b':
  Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors

10 years agoam cf818ebb: Merge "Add stringType and requiredPermission to sensors, effectively...
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

10 years agoMerge "Add stringType and requiredPermission to sensors, effectively adding permissio...
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

10 years agoMerge "Add unique ID to GraphicBuffer"
Dan Stoza [Fri, 11 Apr 2014 18:56:04 +0000 (18:56 +0000)]
Merge "Add unique ID to GraphicBuffer"

10 years agoMerge "BufferQueue: Add producer buffer-released callback"
Dan Stoza [Fri, 11 Apr 2014 17:57:11 +0000 (17:57 +0000)]
Merge "BufferQueue: Add producer buffer-released callback"

10 years agoam 974279d9: am db19e463: Remove unnecessary policy flags.
Jeff Brown [Fri, 11 Apr 2014 08:46:03 +0000 (08:46 +0000)]
am 974279d9: am db19e463: Remove unnecessary policy flags.

* commit '974279d98917c589181b70ea1c377842e7717643':
  Remove unnecessary policy flags.

10 years agoPlumb display power state through display manager.
Jeff Brown [Fri, 11 Apr 2014 08:27:26 +0000 (01:27 -0700)]
Plumb display power state through display manager.

Eliminated the bright here and woke here policy flags since they
were unused.  Simplified the input dispatch policy somewhat.

Bug: 13133142
Change-Id: I74b4dc866c44c46ed43006a48a857f0da4c07cc9

10 years agoam db19e463: Remove unnecessary policy flags.
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.

10 years agoAdd stringType and requiredPermission to sensors, effectively adding permission check...
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

10 years agoMerge "Adding render stats APIs to UiAutomation (framework native)."
Svetoslav [Thu, 10 Apr 2014 19:32:44 +0000 (19:32 +0000)]
Merge "Adding render stats APIs to UiAutomation (framework native)."

10 years agoAdding render stats APIs to UiAutomation (framework native).
Svetoslav [Thu, 20 Mar 2014 17:28:31 +0000 (10:28 -0700)]
Adding render stats APIs to UiAutomation (framework native).

bug:12927198

Change-Id: Ibb1c07f7d89e11281e5c1f27f412a29ac6f9c4ab

10 years agoMerge "Fix sideband stream issues"
Wonsik Kim [Thu, 10 Apr 2014 00:35:24 +0000 (00:35 +0000)]
Merge "Fix sideband stream issues"

10 years agoRemove unnecessary policy flags.
Jeff Brown [Wed, 9 Apr 2014 02:55:38 +0000 (19:55 -0700)]
Remove unnecessary policy flags.

Bug: 13133142
Change-Id: Ib6c63ebad25d84f78623b4a46ccf83953d235fe7

10 years agoam 236ed6d3: am 82fb5809: Merge "restorecon the profile directory."
Nick Kralevich [Wed, 9 Apr 2014 19:49:43 +0000 (19:49 +0000)]
am 236ed6d3: am 82fb5809: Merge "restorecon the profile directory."

* commit '236ed6d3d376b12573cca6878d3b5013371f5bc8':
  restorecon the profile directory.

10 years agoam 82fb5809: Merge "restorecon the profile directory."
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.

10 years agoMerge "restorecon the profile directory."
Nick Kralevich [Wed, 9 Apr 2014 19:41:26 +0000 (19:41 +0000)]
Merge "restorecon the profile directory."

10 years agorestorecon 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>
10 years agoMerge "Temporarily turn on callstack logging"
John Reck [Wed, 9 Apr 2014 17:06:05 +0000 (17:06 +0000)]
Merge "Temporarily turn on callstack logging"

10 years agoTemporarily turn on callstack logging
John Reck [Tue, 8 Apr 2014 22:05:54 +0000 (15:05 -0700)]
Temporarily turn on callstack logging

 Bug: 13745587
 Temporarily turn on callstack logging for gl_no_context() to
 try and track down font cache corruption

Change-Id: I657ee85e811746441c5ce0ffe5adbfb3fb011d4c

10 years agoMerge "BufferQueue: Remove Bn version of create*"
Dan Stoza [Tue, 8 Apr 2014 20:25:53 +0000 (20:25 +0000)]
Merge "BufferQueue: Remove Bn version of create*"

10 years agoBufferQueue: Remove Bn version of create*
Dan Stoza [Mon, 7 Apr 2014 23:33:59 +0000 (16:33 -0700)]
BufferQueue: Remove Bn version of create*

It turns out that there's no reason to have both I* and Bn* versions
of the createBufferQueue method, so I removed the Bn* version.

Change-Id: I66aeb09e10458ae540ddf1f38d2d0154ea8f315b

10 years agoRemove deprecated BufferQueue constructor
Dan Stoza [Mon, 7 Apr 2014 20:41:37 +0000 (13:41 -0700)]
Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: I153b5470b21832cebe3c617d28a4ab9c9bf3b362

10 years agoam 4215f434: am 6dbcebd0: Merge "Always release a buffer" into klp-modular-dev
Andy McFadden [Mon, 7 Apr 2014 16:58:48 +0000 (16:58 +0000)]
am 4215f434: am 6dbcebd0: Merge "Always release a buffer" into klp-modular-dev

* commit '4215f434187d518bf8c9807c9a18a7e0b617f7d2':
  Always release a buffer

10 years agoam 6dbcebd0: Merge "Always release a buffer" into klp-modular-dev
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

10 years agoMerge "Always release a buffer" into klp-modular-dev
Andy McFadden [Mon, 7 Apr 2014 16:46:37 +0000 (16:46 +0000)]
Merge "Always release a buffer" into klp-modular-dev

10 years agoFix sideband stream issues
Wonsik Kim [Mon, 31 Mar 2014 14:16:08 +0000 (23:16 +0900)]
Fix sideband stream issues

- Notify a listener when sideband stream is set
- Mark a layer as visible when sideband stream is set, even though
no buffer is queued.

Change-Id: I9652bf530f2b5ce331533ec1bb3b10a815ca191c

10 years agoam 75b33203: am 4369a4eb: Revert "Add stringType and requiredPermission to sensors...
Etienne Le Grand [Sat, 5 Apr 2014 17:05:44 +0000 (17:05 +0000)]
am 75b33203: am 4369a4eb: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"

* commit '75b332037f6197acb239bfbbf2ac09adb31e9971':
  Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"

10 years agoam 4369a4eb: Revert "Add stringType and requiredPermission to sensors, effectively...
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"

10 years agoRevert "Add stringType and requiredPermission to sensors, effectively adding permissi...
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
(cherry picked from commit 4369a4ebd5ae7567e7075bc82830b83178099ed5)

10 years agoRevert "Add stringType and requiredPermission to sensors, effectively adding permissi...
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

10 years agoam 00f4dde1: am c57a019e: Add stringType and requiredPermission to sensors, effective...
Etienne Le Grand [Sat, 5 Apr 2014 03:53:51 +0000 (03:53 +0000)]
am 00f4dde1: am c57a019e: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors

* commit '00f4dde1aa88576811bca79bc8242e1fc1edb333':
  Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors

10 years agoam c57a019e: Add stringType and requiredPermission to sensors, effectively adding...
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

10 years agoRevert "SurfaceFlinger: send VSYNC power hints to IPowerManager"
Ruchi Kandoi [Sat, 5 Apr 2014 01:09:30 +0000 (18:09 -0700)]
Revert "SurfaceFlinger: send VSYNC power hints to IPowerManager"

This reverts commit d469a1c3285b974cf2637517cc25727da8f82668.

10 years agoAdd stringType and requiredPermission to sensors, effectively adding permission check...
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

10 years agoAlways release a buffer
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

10 years agoSurfaceFlinger: send VSYNC power hints to IPowerManager
Ruchi Kandoi [Wed, 2 Apr 2014 19:50:06 +0000 (12:50 -0700)]
SurfaceFlinger: send VSYNC power hints to IPowerManager

VSYNC power hints are now sent via binder to IPowerManager.
SurfaceFlinger no longer loads a second copy of the PowerHAL.
VSYNC power hints are sent in batches and not on per frame basis.

Change-Id: Icc2eee5df56135bd24dc244a84e7c12dd5511fec

10 years agoam 17251cd4: am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
John Spurlock [Fri, 4 Apr 2014 19:34:07 +0000 (19:34 +0000)]
am 17251cd4: am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.

* commit '17251cd445cf80cfb6085a1b0b317cd85ad5be00':
  Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.

10 years agoam ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
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.

10 years agonative gui: 64-bit compile issues
Mark Salyzyn [Fri, 4 Apr 2014 17:14:44 +0000 (10:14 -0700)]
native gui: 64-bit compile issues

Change-Id: I45f605ff3759fb7ae9f0a6425d557d195f93281e

10 years agoMerge "Add android.software.managedprofiles feature flag."
Adam Connors [Fri, 4 Apr 2014 14:40:56 +0000 (14:40 +0000)]
Merge "Add android.software.managedprofiles feature flag."

10 years agoam 3b1cb037: am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"
Greg Hackmann [Fri, 4 Apr 2014 01:53:51 +0000 (01:53 +0000)]
am 3b1cb037: am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"

* commit '3b1cb037eea56dba0d134c6858f8ddc0f9743ff8':
  make struct Event layout consistent on 32/64-bit

10 years agoam 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"
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

10 years agoAdd ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
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

10 years agoUpdate to follow interface change.
Dianne Hackborn [Thu, 3 Apr 2014 19:06:48 +0000 (12:06 -0700)]
Update to follow interface change.

Change-Id: I3ef37a32144e79b481af1b12c89531f3757689ef

10 years agoam fb3bbd1d: am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
Glenn Kasten [Thu, 3 Apr 2014 17:22:56 +0000 (17:22 +0000)]
am fb3bbd1d: am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"

* commit 'fb3bbd1df323c24dc10c095f29ee8010fc3d1df0':
  AArch64: Correction to OMX_U32 and OMX_S32

10 years agoam d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
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

10 years agoMerge "make struct Event layout consistent on 32/64-bit"
Greg Hackmann [Thu, 3 Apr 2014 17:07:09 +0000 (17:07 +0000)]
Merge "make struct Event layout consistent on 32/64-bit"

10 years agoMerge "AArch64: Correction to OMX_U32 and OMX_S32"
Glenn Kasten [Thu, 3 Apr 2014 17:00:58 +0000 (17:00 +0000)]
Merge "AArch64: Correction to OMX_U32 and OMX_S32"

10 years agoam d09b2acd: am 033bdd72: Merge "Remove global variables from ProcessState."
Narayan Kamath [Thu, 3 Apr 2014 16:56:29 +0000 (16:56 +0000)]
am d09b2acd: am 033bdd72: Merge "Remove global variables from ProcessState."

* commit 'd09b2acdc8ca706c65984956e61c0bb333cee992':
  Remove global variables from ProcessState.

10 years agoam 033bdd72: Merge "Remove global variables from ProcessState."
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.

10 years agoMerge "Remove global variables from ProcessState."
Narayan Kamath [Thu, 3 Apr 2014 13:59:27 +0000 (13:59 +0000)]
Merge "Remove global variables from ProcessState."

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

10 years agoMerge "Misc. buttons aren't gamepad keys."
Michael Wright [Wed, 2 Apr 2014 23:01:20 +0000 (23:01 +0000)]
Merge "Misc. buttons aren't gamepad keys."

10 years agoMisc. buttons aren't gamepad keys.
Michael Wright [Tue, 1 Apr 2014 22:43:43 +0000 (15:43 -0700)]
Misc. buttons aren't gamepad keys.

BUTTON_[1-9] are intended to be misc. buttons so the kernel will
assign them to non-gamepad devices.  As such, we shouldn't treat them
as belonging to gamepads at all.

Bug: 13432364
Change-Id: Ida52ec45dadb53df1a9d36ac3ab212a2d2b56359

10 years agoPowerManager: add powerHint binder method
Ruchi Kandoi [Wed, 2 Apr 2014 19:54:45 +0000 (12:54 -0700)]
PowerManager: add powerHint binder method

Change-Id: Ide1d50bb1580698b25296fbfc1cc63c3b21a00bc

10 years agoAArch64: Correction to OMX_U32 and OMX_S32
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>
10 years agoam fc1544d5: am 17b5ca1e: Merge "opengl: fix UAL conformity"
Glenn Kasten [Wed, 2 Apr 2014 16:27:10 +0000 (16:27 +0000)]
am fc1544d5: am 17b5ca1e: Merge "opengl: fix UAL conformity"

* commit 'fc1544d52d1232ccdf57a05704a013bad784f8f6':
  opengl: fix UAL conformity

10 years agoam 17b5ca1e: Merge "opengl: fix UAL conformity"
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

10 years agoMerge "opengl: fix UAL conformity"
Glenn Kasten [Wed, 2 Apr 2014 16:15:59 +0000 (16:15 +0000)]
Merge "opengl: fix UAL conformity"

10 years agoMerge "Declare ownership of native_handle_t object"
Wonsik Kim [Wed, 2 Apr 2014 06:13:56 +0000 (06:13 +0000)]
Merge "Declare ownership of native_handle_t object"

10 years agoopengl: 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

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 agoAdd android.software.managedprofiles feature flag.
Adam Connors [Tue, 1 Apr 2014 11:14:08 +0000 (12:14 +0100)]
Add android.software.managedprofiles feature flag.

Change-Id: I743bfddd2244b50fcf7386a2b8a21c7da2805cf6

10 years agoBufferQueue: Hook up IProducerListener
Dan Stoza [Fri, 28 Mar 2014 22:19:08 +0000 (15:19 -0700)]
BufferQueue: Hook up IProducerListener

Actually call the producer listener's callback during
IGraphicBufferConsumer::releaseBuffer

Change-Id: Idfa6bb08d62629cd3a198318e6c6fd6a731e73ef

10 years agoAdd unique ID to GraphicBuffer
Dan Stoza [Fri, 28 Mar 2014 22:10:52 +0000 (15:10 -0700)]
Add unique ID to GraphicBuffer

Adds a globally-unique ID (PID + sequence number) to every
GraphicBuffer, which will remain the same while crossing Binder,
even if the underlying handles change.

Change-Id: Ib11330a4c5e99621b82204e0adb31b9a88658426

10 years agoBufferQueue: Add producer buffer-released callback
Dan Stoza [Fri, 21 Mar 2014 20:05:51 +0000 (13:05 -0700)]
BufferQueue: Add producer buffer-released callback

Add a callback to the producer side, onBufferReleased, which will be
called every time the consumer releases a buffer back to the
BufferQueue. This will enable a buffer stream splitter to work
autonomously without having to block on dequeueBuffer.

The binder object used for the callback replaces the generic IBinder
token that was passed into IGraphicBufferProducer::connect to detect
the death of the producer. If a producer does not wish to listen for
buffer release events, it can pass in an instance of the
DummyProducerListener class defined in IProducerListener.h, if it even
cares about death events (BufferQueue doesn't enforce the token being
non-NULL, though perhaps we should).

Change-Id: I23935760673524abeafea2b58dccc3583b368710

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