OSDN Git Service

android-x86/frameworks-native.git
10 years agoam c5294424: am d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603
Arve Hjønnevåg [Sat, 22 Feb 2014 00:52:18 +0000 (00:52 +0000)]
am c5294424: am d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603

* commit 'c5294424386bedad2a240074d0845999f28e662d':
  Binder: Fix some valgrind errors.
  Binder: Don't cast directly from a pointer to binder_uintptr_t
  Binder: Disable attemptIncStrongHandle

10 years agoam d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603
Arve Hjønnevåg [Sat, 22 Feb 2014 00:41:31 +0000 (00:41 +0000)]
am d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603

* commit 'd1c87d37025c49f6a47fe43328572da495ff04c1':
  Binder: Fix some valgrind errors.
  Binder: Don't cast directly from a pointer to binder_uintptr_t
  Binder: Disable attemptIncStrongHandle

10 years agoMerge changes I3432d9d3,I90fcf538,I64398603
Arve Hjønnevåg [Fri, 21 Feb 2014 23:45:01 +0000 (23:45 +0000)]
Merge changes I3432d9d3,I90fcf538,I64398603

* changes:
  Binder: Fix some valgrind errors.
  Binder: Don't cast directly from a pointer to binder_uintptr_t
  Binder: Disable attemptIncStrongHandle

10 years agoam 25a57171: am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks...
Narayan Kamath [Fri, 21 Feb 2014 16:54:17 +0000 (16:54 +0000)]
am 25a57171: am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base"

* commit '25a571718ce9b8b0a1c3738845e9af4b9f3d1816':
  Update EGL codegen to be in sync with frameworks/base

10 years agoam 9b0d5ffb: am f56ae199: Merge "Update GLES codegen to be in sync with frameworks...
Narayan Kamath [Fri, 21 Feb 2014 16:54:17 +0000 (16:54 +0000)]
am 9b0d5ffb: am f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base"

* commit '9b0d5ffbb6cc847843e7f5ae7f891000c90a5989':
  Update GLES codegen to be in sync with frameworks/base

10 years agoam 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base"
Narayan Kamath [Fri, 21 Feb 2014 16:42:50 +0000 (16:42 +0000)]
am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base"

* commit '9076fa78d2541fa14253aaf08e6445fafa17e35b':
  Update EGL codegen to be in sync with frameworks/base

10 years agoam f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base"
Narayan Kamath [Fri, 21 Feb 2014 16:42:49 +0000 (16:42 +0000)]
am f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base"

* commit 'f56ae1999948393ba8c207525d6466ee424c4467':
  Update GLES codegen to be in sync with frameworks/base

10 years agoMerge "Update EGL codegen to be in sync with frameworks/base"
Narayan Kamath [Fri, 21 Feb 2014 14:27:35 +0000 (14:27 +0000)]
Merge "Update EGL codegen to be in sync with frameworks/base"

10 years agoMerge "Update GLES codegen to be in sync with frameworks/base"
Narayan Kamath [Fri, 21 Feb 2014 14:27:16 +0000 (14:27 +0000)]
Merge "Update GLES codegen to be in sync with frameworks/base"

10 years agoam 361d9df3: am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force...
Colin Cross [Fri, 21 Feb 2014 13:54:24 +0000 (13:54 +0000)]
am 361d9df3: am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"

* commit '361d9df38cf9760baffc863d5364a1df9cf8be6b':
  surfaceflinger: add BoardConfig.mk variable to force 32-bit

10 years agoam 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"
Colin Cross [Fri, 21 Feb 2014 00:22:18 +0000 (00:22 +0000)]
am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"

* commit '6b4ecf314461067c0e05130edaf785fb010f471a':
  surfaceflinger: add BoardConfig.mk variable to force 32-bit

10 years agoMerge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"
Colin Cross [Fri, 21 Feb 2014 00:15:58 +0000 (00:15 +0000)]
Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"

10 years agosurfaceflinger: add BoardConfig.mk variable to force 32-bit
Colin Cross [Thu, 20 Feb 2014 23:36:21 +0000 (15:36 -0800)]
surfaceflinger: add BoardConfig.mk variable to force 32-bit

Individual devices may need to force surfaceflinger to compile for
32-bit if they don't have 64-bit GL libraries.

Change-Id: I3703b2f8e36e90cf125d9ed5e6318c3506861948

10 years agoam 6f286114: Revert "Fix "Binder: Make sure binder objects do not overlap" to work...
Arve Hjønnevåg [Thu, 20 Feb 2014 21:27:53 +0000 (21:27 +0000)]
am 6f286114: Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface"

* commit '6f286114ec1d597f3dae987bba6e72dbbc404e32':
  Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface"

10 years agoMerge "Add uid to sensorservice's dump of active connections"
Patrick Tjin [Thu, 20 Feb 2014 20:51:13 +0000 (20:51 +0000)]
Merge "Add uid to sensorservice's dump of active connections"

10 years agoUpdate GLES codegen to be in sync with frameworks/base
Ashok Bhat [Thu, 13 Feb 2014 11:08:25 +0000 (11:08 +0000)]
Update GLES codegen to be in sync with frameworks/base

Patch from synergydev with commit-id 01994c79 changed
core/jni/com_google_android_gles_jni_GLImpl.cpp in the
frameworks/base. However the corresponding code snippet
in frameworks/native was not updated. This patch addresses
the issue.

Change-Id: I89c3d88de832efc8cbbe682c8a7ff7dfbef99db3
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
10 years agoUpdate EGL codegen to be in sync with frameworks/base
Ashok Bhat [Thu, 13 Feb 2014 10:48:02 +0000 (10:48 +0000)]
Update EGL codegen to be in sync with frameworks/base

Patch from Takeshi Aimi with commit-id f9337377 changed
core/jni/android_opengl_EGL14.cpp in the frameworks/base.
However the corresponding code snippet in frameworks/
native was not updated. This patch addresses the issue.

Change-Id: I40bcc43d36d7ab4e0db4a73556a4f7480c7431c1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
10 years agoam 9b5c3b91: am d5a354c6: am d06f6b00: am 67903293: Fix "Binder: Make sure binder...
Arve Hjønnevåg [Thu, 20 Feb 2014 14:59:14 +0000 (14:59 +0000)]
am 9b5c3b91: am d5a354c6: am d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

* commit '9b5c3b9132831ba9078fc7c4001821bcfe8dd39d':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

10 years agoRevert "Fix "Binder: Make sure binder objects do not overlap" to work old binder...
Arve Hjønnevåg [Thu, 20 Feb 2014 04:42:13 +0000 (20:42 -0800)]
Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface"

This branch has the new driver interface so it should not have this change.

This reverts commit 6790329358d1c84af2fe9ba093bcfc1c6176e758.

Change-Id: I9b6d0d653d98dbdb521ef964c5e7c2f14859d340

10 years agoMerge "Fix calls to captureScreen"
Dan Stoza [Thu, 20 Feb 2014 02:43:37 +0000 (02:43 +0000)]
Merge "Fix calls to captureScreen"

10 years agoFix calls to captureScreen
Dan Stoza [Thu, 20 Feb 2014 02:35:30 +0000 (18:35 -0800)]
Fix calls to captureScreen

Change-Id: Ic0ff47afa29f143131906082dff79d4e907b7143

10 years agoMerge "Allow disabling layer rotation during screenshots"
Dan Stoza [Thu, 20 Feb 2014 00:56:34 +0000 (00:56 +0000)]
Merge "Allow disabling layer rotation during screenshots"

10 years agoam d5a354c6: am d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not...
Arve Hjønnevåg [Thu, 20 Feb 2014 00:52:13 +0000 (00:52 +0000)]
am d5a354c6: am d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

* commit 'd5a354c6b7f2ae0b93e018f3024a2fca5f6543a1':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

10 years agoam d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not overlap" to...
Arve Hjønnevåg [Thu, 20 Feb 2014 00:04:44 +0000 (00:04 +0000)]
am d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

* commit 'd06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

10 years agoam 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder...
Arve Hjønnevåg [Thu, 20 Feb 2014 00:00:49 +0000 (00:00 +0000)]
am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

* commit '6790329358d1c84af2fe9ba093bcfc1c6176e758':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

10 years agoFix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Wed, 19 Feb 2014 23:35:52 +0000 (15:35 -0800)]
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface

DO NOT MERGE into any branch that uses the new interface

Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28

10 years agoam 7cc5b880: am e45636a8: am d437364e: am f50b9eaa: Binder: Make sure binder objects...
Arve Hjønnevåg [Wed, 19 Feb 2014 22:06:09 +0000 (22:06 +0000)]
am 7cc5b880: am e45636a8: am d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap

* commit '7cc5b8800c22790b0db9ea0af62fcad2cc998303':
  Binder: Make sure binder objects do not overlap

10 years agoam e45636a8: am d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Wed, 19 Feb 2014 21:50:15 +0000 (21:50 +0000)]
am e45636a8: am d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap

* commit 'e45636a8674b9cbb9305648e21316210e1daf920':
  Binder: Make sure binder objects do not overlap

10 years agoam d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Wed, 19 Feb 2014 21:47:35 +0000 (21:47 +0000)]
am d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap

* commit 'd437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
  Binder: Make sure binder objects do not overlap

10 years agoam f50b9eaa: Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Wed, 19 Feb 2014 21:45:25 +0000 (21:45 +0000)]
am f50b9eaa: Binder: Make sure binder objects do not overlap

* commit 'f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
  Binder: Make sure binder objects do not overlap

10 years agoMerge "Hide three malformed GL bindings"
Andy McFadden [Wed, 19 Feb 2014 19:15:20 +0000 (19:15 +0000)]
Merge "Hide three malformed GL bindings"

10 years agoHide three malformed GL bindings
Andy McFadden [Fri, 14 Feb 2014 21:05:53 +0000 (13:05 -0800)]
Hide three malformed GL bindings

They were replaced with correct bindings a while back, but the
broken methods weren't hidden.

Also, pick up two changes that were made to the generated code
rather than the source.

Bug 6006380

Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830

10 years agoBinder: Fix some valgrind errors.
Arve Hjønnevåg [Wed, 19 Feb 2014 05:10:29 +0000 (21:10 -0800)]
Binder: Fix some valgrind errors.

When using 64 bit binder pointers, only initializing the 32 bit
handle, in a stack allocated struct, will pass uninitialized stack
data to the kernel and other processes.

Change-Id: I3432d9d36bb251d8ddb0a863661aeb80aabb3d92

10 years agoBinder: Don't cast directly from a pointer to binder_uintptr_t
Arve Hjønnevåg [Wed, 19 Feb 2014 05:04:31 +0000 (21:04 -0800)]
Binder: Don't cast directly from a pointer to binder_uintptr_t

When using the 64 bit binder interface from a 32 bit process the
pointer may get sign extended and cause the kernel to fail to read
from it.

Change-Id: I90fcf53880e2aa92e230a9723f9b3f7696170e32

10 years agoam 22a5c8b2: (-s ours) am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE
Andy McFadden [Wed, 19 Feb 2014 00:05:51 +0000 (00:05 +0000)]
am 22a5c8b2: (-s ours) am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE

* commit '22a5c8b2e3c232a7cbe452759f20fc3c8382add7':
  Allow "opaque" flag to be updated. DO NOT MERGE

10 years agoam 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE
Andy McFadden [Tue, 18 Feb 2014 23:59:43 +0000 (23:59 +0000)]
am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE

* commit '44c35ec4a94eb33f7ee0df085c5d2d56d99962cf':
  Allow "opaque" flag to be updated. DO NOT MERGE

10 years agoAllow "opaque" flag to be updated. DO NOT MERGE
Andy McFadden [Thu, 30 Jan 2014 01:17:11 +0000 (17:17 -0800)]
Allow "opaque" flag to be updated. DO NOT MERGE

Moves the "opaque layer" from Layer to Layer::State.  This allows
it to be updated as part of a transaction.

Bug 12387406

Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d

10 years agoam 7a66f7af: am 913a17fd: Merge "libagl: support multilib build"
Colin Cross [Tue, 18 Feb 2014 21:39:56 +0000 (21:39 +0000)]
am 7a66f7af: am 913a17fd: Merge "libagl: support multilib build"

* commit '7a66f7afd1b6a975ab3b99b4765781a0d66958c8':
  libagl: support multilib build

10 years agoam 913a17fd: Merge "libagl: support multilib build"
Colin Cross [Tue, 18 Feb 2014 21:35:25 +0000 (21:35 +0000)]
am 913a17fd: Merge "libagl: support multilib build"

* commit '913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8':
  libagl: support multilib build

10 years agoMerge "libagl: support multilib build"
Colin Cross [Tue, 18 Feb 2014 21:29:50 +0000 (21:29 +0000)]
Merge "libagl: support multilib build"

10 years agoam 8a9a2e24: am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
Colin Cross [Tue, 18 Feb 2014 20:25:54 +0000 (20:25 +0000)]
am 8a9a2e24: am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"

* commit '8a9a2e24db868fba404049d700ae704b0982e5f3':
  Use /(vendor|system)/lib64/egl for 64-bit EGL libraries

10 years agoam d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
Colin Cross [Tue, 18 Feb 2014 20:21:35 +0000 (20:21 +0000)]
am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"

* commit 'd5fe844b41778bf87101fc0a0e4e37e779678c50':
  Use /(vendor|system)/lib64/egl for 64-bit EGL libraries

10 years agoMerge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"
Colin Cross [Tue, 18 Feb 2014 20:14:41 +0000 (20:14 +0000)]
Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"

10 years agoUse /(vendor|system)/lib64/egl for 64-bit EGL libraries
Dan Willemsen [Sun, 16 Feb 2014 18:23:54 +0000 (10:23 -0800)]
Use /(vendor|system)/lib64/egl for 64-bit EGL libraries

Change-Id: Ie64806bfe4ba60a3167b84685cf983d4ada1042d

10 years agoBinder: Disable attemptIncStrongHandle
Arve Hjønnevåg [Sat, 15 Feb 2014 04:14:02 +0000 (20:14 -0800)]
Binder: Disable attemptIncStrongHandle

The driver does not support BC_ATTEMPT_ACQUIRE and will return an error.
IPCThreadState does not handle driver errors, and will resend the failed
command blocking all other commands.

Change-Id: I643986037341821b27b62dc82df933844f4842b8

10 years agoBinder: Make sure binder objects do not overlap
Arve Hjønnevåg [Fri, 14 Feb 2014 03:22:08 +0000 (19:22 -0800)]
Binder: Make sure binder objects do not overlap

Fixes crashing part of bug 11355082.
The driver still leaks references.

Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071

10 years agolibagl: support multilib build
Colin Cross [Thu, 13 Feb 2014 01:15:53 +0000 (17:15 -0800)]
libagl: support multilib build

Use LOCAL_SRC_FILES_arch and LOCAL_CFLAGS_arch to support building
for multiple architectures.

Change-Id: I829c1bea880739bf8184df4006d0a481ffccc5c2

10 years agoAllow disabling layer rotation during screenshots
Dan Stoza [Fri, 14 Feb 2014 23:03:43 +0000 (15:03 -0800)]
Allow disabling layer rotation during screenshots

Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.

Bug: 11805195
Change-Id: I854d87bc84ca06ef9a054a454af1c080ee66fbb8

10 years agoam b37b312b: am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base"
Dianne Hackborn [Fri, 14 Feb 2014 02:00:17 +0000 (02:00 +0000)]
am b37b312b: am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base"

* commit 'b37b312b829c7ab5107c2f96d0a95a557f67a831':
  frameworks/native: move idmap to frameworks/base

10 years agoam 7d86b454: Merge "frameworks/native: move idmap to frameworks/base"
Dianne Hackborn [Fri, 14 Feb 2014 01:54:37 +0000 (01:54 +0000)]
am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base"

* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
  frameworks/native: move idmap to frameworks/base

10 years agoMerge "frameworks/native: move idmap to frameworks/base"
Dianne Hackborn [Fri, 14 Feb 2014 01:45:27 +0000 (01:45 +0000)]
Merge "frameworks/native: move idmap to frameworks/base"

10 years agoam 0e4d2885: am 2044ac43: Merge "Convert all selinux_android_restorecon and _setfilec...
Nick Kralevich [Thu, 13 Feb 2014 00:16:04 +0000 (00:16 +0000)]
am 0e4d2885: am 2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '0e4d2885a34d31f5dbe5a08bdb654953abaf82a2':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.

10 years agoam 2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls...
Nick Kralevich [Wed, 12 Feb 2014 23:15:07 +0000 (23:15 +0000)]
am 2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

* commit '2044ac43e53b517526b3c70dc4fbc60ffc01693f':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.

10 years agoMerge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
Nick Kralevich [Wed, 12 Feb 2014 23:09:44 +0000 (23:09 +0000)]
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."

10 years agoframeworks/native: move idmap to frameworks/base
Colin Cross [Wed, 12 Feb 2014 02:04:03 +0000 (18:04 -0800)]
frameworks/native: move idmap to frameworks/base

idmap depends on libandroidfw, so it should go in frameworks/base.

Change-Id: Ieee30ba9d8170d3118acc89f0617981228a6974b

10 years agoMerge "Add support for injecting events into ActivityContainers."
Jeff Brown [Wed, 12 Feb 2014 00:35:43 +0000 (00:35 +0000)]
Merge "Add support for injecting events into ActivityContainers."

10 years agoam eac45b8a: (-s ours) am ed4d28dd: Add method to apply offset to PointerCoords....
Jeff Brown [Wed, 12 Feb 2014 00:31:55 +0000 (00:31 +0000)]
am eac45b8a: (-s ours) am ed4d28dd: Add method to apply offset to PointerCoords.  (DO NOT MERGE)

* commit 'eac45b8a53e8a17b6c9a1e7bb69a8a791073c007':
  Add method to apply offset to PointerCoords.  (DO NOT MERGE)

10 years agoam ed4d28dd: Add method to apply offset to PointerCoords. (DO NOT MERGE)
Jeff Brown [Wed, 12 Feb 2014 00:26:19 +0000 (00:26 +0000)]
am ed4d28dd: Add method to apply offset to PointerCoords.  (DO NOT MERGE)

* commit 'ed4d28dd70448b13eb74a3166ec8d1c1a530e2d4':
  Add method to apply offset to PointerCoords.  (DO NOT MERGE)

10 years agoAdd support for injecting events into ActivityContainers.
Jeff Brown [Tue, 11 Feb 2014 22:28:48 +0000 (14:28 -0800)]
Add support for injecting events into ActivityContainers.

Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.

Add method to apply offset to PointerCoords.

Change-Id: I55fe4a9a8785ae5a2d3341d214fa3c5107f3963a

10 years agoAdd method to apply offset to PointerCoords. (DO NOT MERGE)
Jeff Brown [Tue, 11 Feb 2014 22:28:48 +0000 (14:28 -0800)]
Add method to apply offset to PointerCoords.  (DO NOT MERGE)

Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6

10 years agoam 6e5fdb15: am 6c14f0ad: Merge "Runtime resource overlay, iteration 2"
Dianne Hackborn [Tue, 11 Feb 2014 21:49:02 +0000 (21:49 +0000)]
am 6e5fdb15: am 6c14f0ad: Merge "Runtime resource overlay, iteration 2"

* commit '6e5fdb1551ca7d117bf7e1acca133a077a8701f0':
  Runtime resource overlay, iteration 2

10 years agoam 6c14f0ad: Merge "Runtime resource overlay, iteration 2"
Dianne Hackborn [Tue, 11 Feb 2014 21:41:23 +0000 (21:41 +0000)]
am 6c14f0ad: Merge "Runtime resource overlay, iteration 2"

* commit '6c14f0ad82be418c742e56fe586657ea0f394b05':
  Runtime resource overlay, iteration 2

10 years agoMerge "Runtime resource overlay, iteration 2"
Dianne Hackborn [Tue, 11 Feb 2014 21:27:35 +0000 (21:27 +0000)]
Merge "Runtime resource overlay, iteration 2"

10 years agoam 99188064: am 340aa8cb: Merge "New command line tool \'idmap\'"
Dianne Hackborn [Tue, 11 Feb 2014 20:41:09 +0000 (20:41 +0000)]
am 99188064: am 340aa8cb: Merge "New command line tool \'idmap\'"

* commit '99188064fd3b2d4ca85b02afefa4adb2562f8940':
  New command line tool 'idmap'

10 years agoam 340aa8cb: Merge "New command line tool \'idmap\'"
Dianne Hackborn [Tue, 11 Feb 2014 20:35:42 +0000 (20:35 +0000)]
am 340aa8cb: Merge "New command line tool \'idmap\'"

* commit '340aa8cbd4afbb68b16f369336cc1c202582f021':
  New command line tool 'idmap'

10 years agoMerge "New command line tool 'idmap'"
Dianne Hackborn [Tue, 11 Feb 2014 20:29:54 +0000 (20:29 +0000)]
Merge "New command line tool 'idmap'"

10 years agoMove inputservice over to frameworks/native
Michael Wright [Mon, 10 Feb 2014 23:10:22 +0000 (15:10 -0800)]
Move inputservice over to frameworks/native

Add all of the underlying input system pieces, minux PointerController and
SpriteController, to inputflinger. This is in preparation for moving input to
its own process and the addition of the input HAL.

Try 2.

Change-Id: I5f571fe86eb570885ae994e1f0552fb558930346

10 years agoRevert "Move inputservice over to frameworks/native"
Michael Wright [Mon, 10 Feb 2014 23:08:18 +0000 (15:08 -0800)]
Revert "Move inputservice over to frameworks/native"

This reverts commit 2dceb67f1f32bd2ec589c4ac3d83da0b8dbe4a5c.

10 years agoMove inputservice over to frameworks/native
Michael Wright [Mon, 10 Feb 2014 22:12:49 +0000 (14:12 -0800)]
Move inputservice over to frameworks/native

Add all of the underlying input system pieces, minux PointerController and
SpriteController, to inputflinger. This is in preparation for moving input to
its own process and the addition of the input HAL.

Change-Id: I1419a740b38756bd0d54fef5f5ca337e6815b1b0

10 years agoAdd contains point method to Region
Michael Wright [Mon, 10 Feb 2014 21:00:14 +0000 (13:00 -0800)]
Add contains point method to Region

Change-Id: I553433ff7ac39f14ffca8278960d2abc95b4dd63

10 years agoConvert all selinux_android_restorecon and _setfilecon calls to new API.
Stephen Smalley [Fri, 7 Feb 2014 14:16:46 +0000 (09:16 -0500)]
Convert all selinux_android_restorecon and _setfilecon calls to new API.

libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
10 years agoam 1772970f: am 0f0ccf07: Add new software features
Adam Lesinski [Thu, 6 Feb 2014 19:36:37 +0000 (19:36 +0000)]
am 1772970f: am 0f0ccf07: Add new software features

* commit '1772970fa510b915d7b0006093933278db57f899':
  Add new software features

10 years agoam 0f0ccf07: Add new software features
Adam Lesinski [Thu, 6 Feb 2014 19:30:54 +0000 (19:30 +0000)]
am 0f0ccf07: Add new software features

* commit '0f0ccf07bad594b618f4fcce9a8f79a5bc188bb3':
  Add new software features

10 years agoam 2b957503: am 74be0f7b: Merge "binder: fix all warnings"
Colin Cross [Thu, 6 Feb 2014 03:07:47 +0000 (03:07 +0000)]
am 2b957503: am 74be0f7b: Merge "binder: fix all warnings"

* commit '2b957503b77c938e0698ffa8904e20c38c408d81':
  binder: fix all warnings

10 years agoam 74be0f7b: Merge "binder: fix all warnings"
Colin Cross [Thu, 6 Feb 2014 02:59:37 +0000 (02:59 +0000)]
am 74be0f7b: Merge "binder: fix all warnings"

* commit '74be0f7be35e7b40a322fa9a407cb49265333a0b':
  binder: fix all warnings

10 years agoMerge "binder: fix all warnings"
Colin Cross [Thu, 6 Feb 2014 02:06:42 +0000 (02:06 +0000)]
Merge "binder: fix all warnings"

10 years agobinder: fix all warnings
Colin Cross [Thu, 6 Feb 2014 01:42:44 +0000 (17:42 -0800)]
binder: fix all warnings

Fix warnings related to casting pointers to ints, using %d or %ld to
print size_t/ssize_t, and unused parameters.

Change-Id: I7a13ba83d402952989c1f795cd9e880a95b98d9e

10 years agoAdd uid to sensorservice's dump of active connections
Patrick Tjin [Wed, 5 Feb 2014 23:06:03 +0000 (15:06 -0800)]
Add uid to sensorservice's dump of active connections

Change-Id: I1c365157bcd28a93635dbde4a8d91c79750e03ae

10 years agoAdd new software features
Adam Lesinski [Wed, 5 Feb 2014 02:03:52 +0000 (18:03 -0800)]
Add new software features

Wearable devices are much more stripped down than
handheld and tablet devices. There are system
services that must not be present on wearable
devices. Those services have their own feature
xml files that get copied to the system image
as needed. They are included by default in the
handheld and tablet core feature files in order
to maintain previous behavior.

Wearable devices should always copy the
data/etc/wearable_core_hardware.xml file and
whatever other files that represent required
services (eg. data/etc/android.software.print.xml).

Change-Id: I410442d45854fe54cba1131ce488a5a459ac580a

10 years agoMerge "Fix virtual display nesting"
Dan Stoza [Wed, 5 Feb 2014 18:55:10 +0000 (18:55 +0000)]
Merge "Fix virtual display nesting"

10 years agoam bdab63e0: am 055dac1b: Merge "Fixed apparent copy/paste mistake Bug: 11634373"
Andrew Hsieh [Wed, 5 Feb 2014 08:06:22 +0000 (08:06 +0000)]
am bdab63e0: am 055dac1b: Merge "Fixed apparent copy/paste mistake Bug: 11634373"

* commit 'bdab63e06b6bacb60991420891cb06fe3dc5654f':
  Fixed apparent copy/paste mistake Bug: 11634373

10 years agoam 055dac1b: Merge "Fixed apparent copy/paste mistake Bug: 11634373"
Andrew Hsieh [Wed, 5 Feb 2014 07:58:00 +0000 (07:58 +0000)]
am 055dac1b: Merge "Fixed apparent copy/paste mistake Bug: 11634373"

* commit '055dac1b54af46a0608b32e83fcae45e75a4a8f0':
  Fixed apparent copy/paste mistake Bug: 11634373

10 years agoMerge "Fixed apparent copy/paste mistake Bug: 11634373"
Andrew Hsieh [Wed, 5 Feb 2014 07:16:30 +0000 (07:16 +0000)]
Merge "Fixed apparent copy/paste mistake Bug: 11634373"

10 years agoFixed apparent copy/paste mistake
David Friedman [Wed, 5 Feb 2014 03:11:33 +0000 (11:11 +0800)]
Fixed apparent copy/paste mistake
Bug: 11634373

Change-Id: I9b0ac4d3b4a9a2999b2013abd39465a062ec51ea

10 years agoFix 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.

Bug: 12101046
Change-Id: I600365c0fd5d3ad93e04295d26cf9de177ffc79b

10 years agoam 67041e68: am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"
Siva Velusamy [Tue, 4 Feb 2014 19:25:21 +0000 (19:25 +0000)]
am 67041e68: am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"

* commit '67041e6841d89efb0dbaf4562b601b80be61e1e6':
  GLES_trace: fix compile errors on 64 bit architectures

10 years agoam fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"
Siva Velusamy [Tue, 4 Feb 2014 19:19:38 +0000 (19:19 +0000)]
am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"

* commit 'fd6a3ff4b4dda34f8e6e03989dd7466e4cbd8b0e':
  GLES_trace: fix compile errors on 64 bit architectures

10 years agoMerge "GLES_trace: fix compile errors on 64 bit architectures"
Siva Velusamy [Tue, 4 Feb 2014 19:14:06 +0000 (19:14 +0000)]
Merge "GLES_trace: fix compile errors on 64 bit architectures"

10 years agoam dc425805: (-s ours) am e636692a: [DO NOT MERGE] Extend OpenMAX IL definitions...
Changwan Ryu [Tue, 4 Feb 2014 15:40:03 +0000 (15:40 +0000)]
am dc425805: (-s ours) am e636692a: [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3

* commit 'dc425805b27cad16922ebf51b8504bdf7ab4ddfd':
  [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3

10 years agoam e636692a: [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
Changwan Ryu [Tue, 4 Feb 2014 07:31:42 +0000 (07:31 +0000)]
am e636692a: [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3

* commit 'e636692a2eecead363f06297e7b5b379079331da':
  [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3

10 years agoam 8641112a: am 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BI...
Arve Hjønnevåg [Tue, 4 Feb 2014 02:10:18 +0000 (02:10 +0000)]
am 8641112a: am 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."

* commit '8641112a1c3d4ff3ed68131d07eed01b715ac906':
  Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.

10 years agoam 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_...
Arve Hjønnevåg [Tue, 4 Feb 2014 02:01:45 +0000 (02:01 +0000)]
am 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."

* commit '4e7fd9506103dcc9750788caf1f94b8d1348f37b':
  Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.

10 years agoMerge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT...
Arve Hjønnevåg [Tue, 4 Feb 2014 00:48:12 +0000 (00:48 +0000)]
Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."

10 years agoUse 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is...
Arve Hjønnevåg [Mon, 3 Feb 2014 22:46:30 +0000 (14:46 -0800)]
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.

Change-Id: I46a29939fa29ec9421ab6dff3285502f69a31745

10 years agoam c93865de: am 58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I5952...
Arve Hjønnevåg [Mon, 3 Feb 2014 22:11:16 +0000 (22:11 +0000)]
am c93865de: am 58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...

* commit 'c93865de80a16d3638936890fb42eb175284044b':
  ServiceManager: Implement PING_TRANSACTION
  ServiceManager: Use 32/64 bit types from new binder header
  Binder: Use 64 bit pointers in 32 processes if selected by the target
  Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
  Binder: Make binder portable
  ServiceManager: Fix the binder interface
  ServiceManager: Store handles in uint32_t instead of void *
  ServiceManager: Generic Fixes
  ServiceManager: Add extra error handling
  ServiceManager: Fix Android.mk
  ServiceManager: Make use of kernel exported structures

10 years agoam 58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
Arve Hjønnevåg [Mon, 3 Feb 2014 21:18:35 +0000 (21:18 +0000)]
am 58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...

* commit '58242fc29881cf29d56ee6e5fde6d73b16d0b67c':
  ServiceManager: Implement PING_TRANSACTION
  ServiceManager: Use 32/64 bit types from new binder header
  Binder: Use 64 bit pointers in 32 processes if selected by the target
  Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
  Binder: Make binder portable
  ServiceManager: Fix the binder interface
  ServiceManager: Store handles in uint32_t instead of void *
  ServiceManager: Generic Fixes
  ServiceManager: Add extra error handling
  ServiceManager: Fix Android.mk
  ServiceManager: Make use of kernel exported structures

10 years agoMerge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
Arve Hjønnevåg [Mon, 3 Feb 2014 21:12:57 +0000 (21:12 +0000)]
Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...

* changes:
  ServiceManager: Implement PING_TRANSACTION
  ServiceManager: Use 32/64 bit types from new binder header
  Binder: Use 64 bit pointers in 32 processes if selected by the target
  Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
  Binder: Make binder portable
  ServiceManager: Fix the binder interface
  ServiceManager: Store handles in uint32_t instead of void *
  ServiceManager: Generic Fixes
  ServiceManager: Add extra error handling
  ServiceManager: Fix Android.mk
  ServiceManager: Make use of kernel exported structures

10 years agoRuntime resource overlay, iteration 2
Mårten Kongstad [Fri, 31 Jan 2014 13:42:59 +0000 (14:42 +0100)]
Runtime resource overlay, iteration 2

Support any number of overlay packages. Support any target package.

UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes

    <overlay targetPackage="com.target.package"/>

For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.

THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').

UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.

Zygote initialization
   Initial AssetManager object created
+    idmap --scan creates idmaps for overlays targeting 'android', \
           stores list of overlays in /data/resource-cache/overlays.list
   AssetManager caches framework-res.apk
+  AssetManager caches overlay packages listed in overlays.list

Android boot
   New AssetManager's ResTable acquired
     AssetManager re-uses cached framework-res.apk
+    AssetManager re-uses cached 'android' overlays (if any)

App boot
   ActivityThread prepares AssetManager to load app.apk
+  ActivityThread prepares AssetManager to load app overlays (if any)
   New AssetManager's ResTable acquired as per Android boot

SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.

LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.

When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.

Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:

    <overlay targetPackage="com.target.package" priority="1234"/>

Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.

Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.

The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.

        +------+------+-     -+------+------+
        | 0x01 |      |  ...  |      | 0x7f |
        +------+------+-     -+------+------+
            |                           |
        "android"                Target package A
                                        |
                       Pre-installed overlay B (priority 1)
                                        |
                       Pre-installed overlay C (priority 2)

Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e

10 years agoNew command line tool 'idmap'
Mårten Kongstad [Fri, 31 Jan 2014 13:00:54 +0000 (14:00 +0100)]
New command line tool 'idmap'

Introduce a new tool 'idmap' to handle generation and verification of
idmap files. The tool is modelled on 'dexopt', and is intended to be
used similarly, notably by 'installd'.
See cmds/idmap/idmap.cpp for further documentation on 'idmap'.

Note: this commit is interdependent on a commit in project build/ to add
'idmap' to PRODUCT_PACKAGES.

Note: the changes to androidfw are only stubs. The actual implementation
will be provided in Runtime resource overlay, iteration 2.

Change-Id: I7131b74ece1e46c8a9c0a31d103e686aa07da2bb

10 years ago[DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
Changwan Ryu [Mon, 28 Oct 2013 02:32:47 +0000 (11:32 +0900)]
[DO NOT MERGE] Extend OpenMAX IL definitions to support AC3

OpenMAX IL does not have generic support for AC3, but IL 1.1.2 and above
supports component extension APIs, which enable us to add our own constants
and definitions.

Change-Id: Iecee4f8bb3112b0720ceae9192017e12d3fe97e3