OSDN Git Service
Narayan Kamath [Fri, 11 Apr 2014 12:17:00 +0000 (13:17 +0100)]
Add instruction-set arguments to installd commands.
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.
Change-Id: Ie480841b3e917dabe23ad4d5f4a0b08990500a51
Conley Owens [Wed, 30 Apr 2014 00:09:36 +0000 (00:09 +0000)]
Merge "Add TYPE_MAGNIFICATION_OVERLAY to isTrustedOverlay"
Michael Wright [Tue, 29 Apr 2014 22:31:17 +0000 (22:31 +0000)]
Merge "Move key attribute information out of native."
Brian Carlstrom [Mon, 28 Apr 2014 22:10:01 +0000 (22:10 +0000)]
am
58ea37fe: am
108ed9fa: Merge "Fix incorrect odex path handling"
* commit '
58ea37fe26fc733db478e606374f08d8a9d070cc':
Fix incorrect odex path handling
Brian Carlstrom [Mon, 28 Apr 2014 22:06:09 +0000 (22:06 +0000)]
am
108ed9fa: Merge "Fix incorrect odex path handling"
* commit '
108ed9fa946ec516c0d853927c76ebbfca1dcb23':
Fix incorrect odex path handling
Brian Carlstrom [Mon, 28 Apr 2014 22:00:35 +0000 (22:00 +0000)]
Merge "Fix incorrect odex path handling"
Chih-Wei Huang [Mon, 28 Apr 2014 07:47:45 +0000 (15:47 +0800)]
Fix incorrect odex path handling
It's wrong to just concatenate the apk_path and .odex.
The bug prevents the prebuilt odex being used since Kitkat.
The patch is copied from the code of JellyBean.
Change-Id: I0ce8a877e3df8ae1ab9a0e3aeeef2d5253efc223
Dianne Hackborn [Fri, 25 Apr 2014 17:06:05 +0000 (17:06 +0000)]
Merge "Add feature for voice recognition software."
Andy McFadden [Fri, 25 Apr 2014 14:23:28 +0000 (14:23 +0000)]
Merge "Update HWC dump format"
John Reck [Thu, 24 Apr 2014 23:49:19 +0000 (23:49 +0000)]
Merge "Revert "Temporarily turn on callstack logging""
John Reck [Thu, 24 Apr 2014 23:34:32 +0000 (23:34 +0000)]
Revert "Temporarily turn on callstack logging"
Bug:
13927881
'twas useful and perhaps should be always enabled (please?)
but not like this, so reverting.
This reverts commit
db4488565a791fc769b0b0b6ca4a0689eb3d5f4e.
Change-Id: I9a78c6d6e48342ef6ca1f2f7b5303ca47ccc6086
Alex Glaznev [Thu, 24 Apr 2014 21:53:29 +0000 (21:53 +0000)]
Merge "Add VP8 encoder extra parameters structure to support configuring encoder key frame interval, number of temporal layers, type of temporal layer pattern and minimum and maximum quantization parameters."
Aravind Akella [Thu, 24 Apr 2014 00:41:07 +0000 (00:41 +0000)]
Merge "Enable wakeup sensors."
Alex Glaznev [Mon, 7 Apr 2014 18:09:56 +0000 (11:09 -0700)]
Add VP8 encoder extra parameters structure to support
configuring encoder key frame interval, number of
temporal layers, type of temporal layer pattern
and minimum and maximum quantization parameters.
Bug:
11969958
Change-Id: I561e03148a7c5d928b5bf350ad3631ae69871065
Aravind Akella [Wed, 12 Feb 2014 02:58:52 +0000 (18:58 -0800)]
Enable wakeup sensors.
SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a
timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now.
Bug:
9774884
Change-Id: If3b5acb99c9cf0cd29012fcfa9d6b04c74133d01
Conley Owens [Wed, 23 Apr 2014 20:50:03 +0000 (13:50 -0700)]
Add TYPE_MAGNIFICATION_OVERLAY to isTrustedOverlay
This fixes a bug where a View with filterTouchesWhenObscured will have
all touches filtered when in magnification accessibility mode. This is
due to magnification being a separate Window over top of the running
Activity. The method onFilterTouchEventForSecurity in View will then
always return false when filterTouchesWhenObscured is enabled on the
View. By adding the magnification Window to the list of Trusted Overlays
we can ensure that touches will work properly with this property
enabled.
This corresponds to AOSP change
I07706588a625682d05da5cb19f401139eb08a54c
Change-Id: Iba095433a1f9045349d1b47a58a33b850ed31c97
Dan Stoza [Wed, 23 Apr 2014 16:46:04 +0000 (16:46 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Dan Stoza [Wed, 23 Apr 2014 14:38:47 +0000 (14:38 +0000)]
am
bba1385d: am
f3c07d4f: Fix virtual display nesting
* commit '
bba1385d1cfdbe80d7e5f441d943edd4c5708eca':
Fix virtual display nesting
Dan Stoza [Wed, 23 Apr 2014 14:36:20 +0000 (14:36 +0000)]
am
f3c07d4f: Fix virtual display nesting
* commit '
f3c07d4f70f33c2fe5b14ca8fbcdfa4133cc72c7':
Fix virtual display nesting
Michael Wright [Tue, 22 Apr 2014 22:03:51 +0000 (15:03 -0700)]
Move key attribute information out of native.
Native doesn't ever actually care about the attributes of keys, so
move all of it up into the managed layer and move all of the key
names down so they're defined once.
Change-Id: Ic8ded13ce050b2b98744735ff50d11e8d882d7d5
Andy McFadden [Tue, 22 Apr 2014 01:08:54 +0000 (18:08 -0700)]
Update HWC dump format
Shortens a few fields. Displays the format as a string.
Change-Id: Ib471f05603763e250bad165db610f8e173e8423a
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.
(cherry-pick from master I600365c0fd5d3ad93e04295d26cf9de177ffc79b)
Bug:
12101046
Change-Id: I6182993d53537781aedb522f97a50f06eed8b80f
Dan Stoza [Tue, 22 Apr 2014 21:12:55 +0000 (14:12 -0700)]
Remove deprecated BufferQueue constructor
Finally remove the BufferQueue constructor itself. From now on, all
BufferQueues must be created through the createBufferQueue method.
Bug:
13415624
Change-Id: I192bf9430265bab761dcd59db1f02c9d0ac4feed
Dan Stoza [Mon, 21 Apr 2014 21:40:33 +0000 (21:40 +0000)]
Merge "BufferQueue: Guard against unbounded queue growth"
Jesse Hall [Mon, 21 Apr 2014 19:03:03 +0000 (19:03 +0000)]
am
43b3e600: am
3f0d5669: Merge "Expose core EGL entry points to eglGetProcAddress"
* commit '
43b3e600c1a477697408b1cac4cbd40b0ad97d56':
Expose core EGL entry points to eglGetProcAddress
Jesse Hall [Mon, 21 Apr 2014 18:57:12 +0000 (18:57 +0000)]
am
3f0d5669: Merge "Expose core EGL entry points to eglGetProcAddress"
* commit '
3f0d5669eb437ce1f9ce599e196d045534ec3d4f':
Expose core EGL entry points to eglGetProcAddress
Jesse Hall [Mon, 21 Apr 2014 18:51:18 +0000 (18:51 +0000)]
Merge "Expose core EGL entry points to eglGetProcAddress"
Dan Stoza [Mon, 21 Apr 2014 16:11:21 +0000 (16:11 +0000)]
Merge "BufferQueue: Increase max slots from 32 to 64"
Dan Stoza [Fri, 18 Apr 2014 22:43:35 +0000 (15:43 -0700)]
BufferQueue: Guard against unbounded queue growth
Adds logic to dequeueBuffer that blocks if there are currently too
many buffers in the queue. This prevents unbounded growth around
times where the slots are cleared but the queue is not (e.g.,
during rapid connect/disconnect or setBufferCount activity). This
replaces the fix from ag/377958 in a more general way.
Bug:
11293214
Change-Id: Ieb7adfcd076ff7ffe3d4d369397b2c29cf5099c3
Dan Stoza [Fri, 18 Apr 2014 20:33:52 +0000 (20:33 +0000)]
Merge "libgui: Remove unnecessary casts in SurfaceControl"
Dianne Hackborn [Mon, 7 Apr 2014 18:14:20 +0000 (11:14 -0700)]
Add feature for voice recognition software.
Change-Id: Ie11c6f9b7eb466f17e9ce145b582ffe7d2475cbd
Dan Stoza [Wed, 9 Apr 2014 23:14:51 +0000 (16:14 -0700)]
BufferQueue: Increase max slots from 32 to 64
Increases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask
returned by IGBC::getReleasedBuffers from 32 to 64 bits.
Bug:
13174352
Change-Id: Ie8ef0853916cfb91f83881c7241886bb1950f01a
Dan Stoza [Fri, 18 Apr 2014 17:20:30 +0000 (17:20 +0000)]
Merge "BufferQueue: Add StreamSplitter"
Dan Stoza [Fri, 18 Apr 2014 16:09:10 +0000 (16:09 +0000)]
Merge "BufferQueueProducer: add detachNextBuffer"
Mohamad Ayyash [Tue, 15 Apr 2014 22:10:09 +0000 (22:10 +0000)]
Merge "atrace: Add f2fs sync and ext4 write tracepoints."
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
Dan Stoza [Fri, 28 Mar 2014 22:34:33 +0000 (15:34 -0700)]
BufferQueue: Add StreamSplitter
Adds a StreamSplitter class, that takes one IGraphicBufferConsumer
interface and multiple IGraphicBufferProducer interfaces and
implements a one-to-many broadcast of GraphicBuffers (while managing
fences correctly).
Change-Id: I38ecdf3e311ac521bc781c30dde0cc382a4376a3
Dan Stoza [Fri, 28 Mar 2014 22:25:31 +0000 (15:25 -0700)]
BufferQueueProducer: add detachNextBuffer
Adds a new method, IGBP::detachNextBuffer, that effectively does
dequeue + request + detach in a single call, but does not need to
know anything about the dequeued buffer, and will not block on
dequeue. This is mostly for the upcoming StreamSplitter to use in
its onBufferReleased callback.
Change-Id: Ie88a69de109003acebaa486a5b44c8a455726550
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
Colin Cross [Tue, 15 Apr 2014 02:10:51 +0000 (02:10 +0000)]
Merge "libui: 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
Dan Stoza [Mon, 14 Apr 2014 16:26:42 +0000 (16:26 +0000)]
Merge "BufferQueue: Hook up IProducerListener"
Mohamad Ayyash [Tue, 8 Apr 2014 22:24:11 +0000 (15:24 -0700)]
atrace: Add f2fs sync and ext4 write tracepoints.
Change-Id: I76fa32f7d80aaeafc26494d9018b7a004e7dc3d2
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
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
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
Dan Stoza [Fri, 11 Apr 2014 18:56:04 +0000 (18:56 +0000)]
Merge "Add unique ID to GraphicBuffer"
Dan Stoza [Fri, 11 Apr 2014 17:57:11 +0000 (17:57 +0000)]
Merge "BufferQueue: Add producer buffer-released callback"
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.
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
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.
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
Dan Stoza [Thu, 10 Apr 2014 20:50:03 +0000 (13:50 -0700)]
libgui: Remove unnecessary casts in SurfaceControl
There are a number of places where we create a local
sp<SurfaceComposerClient>& to something that is already an
sp<SurfaceComposerClient>, which is redundant. This fixes that
by removing the local references.
Bug:
13814149
Change-Id: Ic558cbda651c344e5cac97022c97563928eed29c
Svetoslav [Thu, 10 Apr 2014 19:32:44 +0000 (19:32 +0000)]
Merge "Adding 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
Wonsik Kim [Thu, 10 Apr 2014 00:35:24 +0000 (00:35 +0000)]
Merge "Fix sideband stream issues"
Jeff Brown [Wed, 9 Apr 2014 02:55:38 +0000 (19:55 -0700)]
Remove unnecessary policy flags.
Bug:
13133142
Change-Id: Ib6c63ebad25d84f78623b4a46ccf83953d235fe7
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.
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.
Nick Kralevich [Wed, 9 Apr 2014 19:41:26 +0000 (19:41 +0000)]
Merge "restorecon 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>
John Reck [Wed, 9 Apr 2014 17:06:05 +0000 (17:06 +0000)]
Merge "Temporarily 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
Dan Stoza [Tue, 8 Apr 2014 20:25:53 +0000 (20:25 +0000)]
Merge "BufferQueue: 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
Dan Stoza [Mon, 7 Apr 2014 20:41:37 +0000 (13:41 -0700)]
Remove deprecated BufferQueue constructor
Bug:
13415624
Change-Id: I153b5470b21832cebe3c617d28a4ab9c9bf3b362
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
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
Andy McFadden [Mon, 7 Apr 2014 16:46:37 +0000 (16:46 +0000)]
Merge "Always release a buffer" into klp-modular-dev
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
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"
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"
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)
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
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
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
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.
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
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
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
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.
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.
Mark Salyzyn [Fri, 4 Apr 2014 17:14:44 +0000 (10:14 -0700)]
native gui: 64-bit compile issues
Change-Id: I45f605ff3759fb7ae9f0a6425d557d195f93281e
Adam Connors [Fri, 4 Apr 2014 14:40:56 +0000 (14:40 +0000)]
Merge "Add android.software.managedprofiles feature flag."
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
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
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
Dianne Hackborn [Thu, 3 Apr 2014 19:06:48 +0000 (12:06 -0700)]
Update to follow interface change.
Change-Id: I3ef37a32144e79b481af1b12c89531f3757689ef
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
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
Greg Hackmann [Thu, 3 Apr 2014 17:07:09 +0000 (17:07 +0000)]
Merge "make struct Event layout consistent on 32/64-bit"
Glenn Kasten [Thu, 3 Apr 2014 17:00:58 +0000 (17:00 +0000)]
Merge "AArch64: Correction to OMX_U32 and OMX_S32"
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.
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.
Narayan Kamath [Thu, 3 Apr 2014 13:59:27 +0000 (13:59 +0000)]
Merge "Remove 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
Michael Wright [Wed, 2 Apr 2014 23:01:20 +0000 (23:01 +0000)]
Merge "Misc. 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
Ruchi Kandoi [Wed, 2 Apr 2014 19:54:45 +0000 (12:54 -0700)]
PowerManager: add powerHint binder method
Change-Id: Ide1d50bb1580698b25296fbfc1cc63c3b21a00bc
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>