OSDN Git Service
Felipe Leme [Wed, 13 Apr 2016 18:38:34 +0000 (18:38 +0000)]
Merge "Added support for \'bugreport -z\'." into nyc-dev
am:
ef1081f
* commit '
ef1081f96d3c3915fe84c505674fbd70170ed284':
Added support for 'bugreport -z'.
Change-Id: I437206ba9cd03e7b9cea4a74f2c25f83774b180a
Philip Cuadra [Wed, 13 Apr 2016 18:38:34 +0000 (18:38 +0000)]
Merge "Binder: add pid to thread name for binder threads." into nyc-dev
am:
9b9fc47
* commit '
9b9fc47133756806e02bf2d0c8798b98be3ad968':
Binder: add pid to thread name for binder threads.
Change-Id: I2b9137cfbe6db90064d2b0bd61e8f516e182fcd2
TreeHugger Robot [Wed, 13 Apr 2016 18:28:19 +0000 (18:28 +0000)]
Merge "Added support for 'bugreport -z'." into nyc-dev
Philip Cuadra [Wed, 13 Apr 2016 18:27:59 +0000 (18:27 +0000)]
Merge "Binder: add pid to thread name for binder threads." into nyc-dev
Philip Cuadra [Fri, 8 Apr 2016 17:29:14 +0000 (10:29 -0700)]
Binder: add pid to thread name for binder threads.
Including the pid in the binder thread name improves attribution of
binder time in systraces.
Change-Id: I40461b6f98c51c6e5f0acc1c24d443d0e7109b69
Felipe Leme [Tue, 12 Apr 2016 23:36:51 +0000 (16:36 -0700)]
Added support for 'bugreport -z'.
Dumpstate now supports zipped bugreport, whose output is more complete
than the flat-file bugreports provided prior to N.
The whole workflow is split in different components:
- adb supports a 'bugreport -z <ZIP_FILE>' option, which calls a
bugreportz binary.
- bugreportz starts the dumpstatez service.
- dumpstatez starts dumpstate with some flags that opens a socket for
control (not output).
- Once dumpstate is finished, it prints the bugreport location to
stdout.
- adb pulls the zip file and renames according to the command-line
argument.
- bugreport prints a deprecation message.
The reason for a new binary (bugreportz) instead of passing arguments to
bugreport (like -z) is backward compatibility: pre-N versions of
bugreport would ignore such argument and generate a text bugreport,
which is not what adb would be expecting.
BUG:
27653204
Change-Id: I47f6f677eba11d5fb54818ae5a0b3cab069776ee
Elliott Hughes [Wed, 13 Apr 2016 14:48:41 +0000 (14:48 +0000)]
Merge "Move dumpstate off mincrypt and over to BoringSSL." into nyc-dev-plus-aosp
Jorim Jaggi [Wed, 13 Apr 2016 02:16:10 +0000 (02:16 +0000)]
Merge "Revert "Death to synchronous transactions (1/2)"" into nyc-dev
am:
ad798d0
* commit '
ad798d03beb54e575abb693f3790c4e3855f32d4':
Revert "Death to synchronous transactions (1/2)"
Change-Id: I516d29a73391e8a2c43c817ec2a9e7ac5297c949
Jorim Jaggi [Wed, 13 Apr 2016 02:06:48 +0000 (02:06 +0000)]
Merge "Revert "Death to synchronous transactions (1/2)"" into nyc-dev
Jorim Jaggi [Wed, 13 Apr 2016 01:40:35 +0000 (01:40 +0000)]
Revert "Death to synchronous transactions (1/2)"
This reverts commit
c6a607aa7ab96f6b1bac487cffd1899e1f1cdcf5.
It causes issues when resizing: default buffer size on the consumer side
only gets set when the transaction actually executes. But because
consumer is not blocked on SF over WM anymore, it gets the default
buffer size before the surface is resized, and thus uses wrong bounds
for the buffer to be drawn, and never submits another one.
This needs a more involved fix.
Bug:
28122036
Bug:
28128613
Change-Id: I0e738f99e43fc9ea25426e9e6e607e01413d3bb7
Chia-I Wu [Wed, 13 Apr 2016 00:22:14 +0000 (00:22 +0000)]
Merge "vulkan: fix vkGetDeviceProcAddr for intercepted commands" into nyc-dev
am:
a1d53fa
* commit '
a1d53fa7c98db0f830782960e48736a3ea2d8da4':
vulkan: fix vkGetDeviceProcAddr for intercepted commands
Change-Id: I75ba449c6f774a62a485776a29d38fc04fca153a
Chia-I Wu [Wed, 13 Apr 2016 00:14:07 +0000 (00:14 +0000)]
Merge "vulkan: fix vkGetDeviceProcAddr for intercepted commands" into nyc-dev
Nick Kralevich [Tue, 12 Apr 2016 23:55:51 +0000 (23:55 +0000)]
Drop compatibility with pre 2012 adb clients
am:
a50117e
* commit '
a50117e54a97aea5b3b2c279fb5643704c460b05':
Drop compatibility with pre 2012 adb clients
Change-Id: Ifdb0e9f2d869284a20fa5f064260f5a17c2391c2
Nick Kralevich [Tue, 12 Apr 2016 23:32:33 +0000 (16:32 -0700)]
Drop compatibility with pre 2012 adb clients
On very old versions of adb, when "adb bugreport" was executed,
the command "adb shell dumpstate" was run. This was later changed
to "adb shell bugreport". Change
1e339878c128ef47271278779c2685a8dfa49cd1 added a backwards
compatibility hack (see bug
6391938).
It turns out that nobody has been able to execute
/system/bin/dumpstate as a non-root user for 2 releases now due
to SELinux restrictions, so maintaining the code bloat to support
this workaround is pointless.
Delete the code.
Bug:
6391938
Change-Id: I49eebcca1fcec5a39593c53e2e6d23ec87f65a35
Elliott Hughes [Tue, 12 Apr 2016 23:28:31 +0000 (16:28 -0700)]
Move dumpstate off mincrypt and over to BoringSSL.
Bug: http://b/
27287913
Change-Id: I2104e3f963c62e2f9dd0b216010dbc457c6e5857
Chia-I Wu [Tue, 12 Apr 2016 03:16:17 +0000 (11:16 +0800)]
vulkan: fix vkGetDeviceProcAddr for intercepted commands
This allows vulkan::api::DestroyDevice to properly unreference layers.
Bug:
28077754
Change-Id: I194925d29dee3489b63f4a44669c791d378afa39
Chia-I Wu [Tue, 12 Apr 2016 22:42:21 +0000 (22:42 +0000)]
vulkan: fix support for unknown extensions
am:
1600e26
* commit '
1600e269dbf9f2cd818886c55b3e0933dfec7a86':
vulkan: fix support for unknown extensions
Change-Id: I9883289f8460fd9f8180520573855e457520abd8
Chia-I Wu [Tue, 12 Apr 2016 01:40:06 +0000 (09:40 +0800)]
vulkan: fix support for unknown extensions
Never set the bit ProcHook::EXTENSION_UNKNOWN, otherwise std::out_of_range
will be thrown.
Change-Id: I0a1343079647162bf17494acaaa69f1fa26b72f8
Jesse Hall [Tue, 12 Apr 2016 00:48:13 +0000 (00:48 +0000)]
Merge "libvulkan: Use a stub HAL when no real Vulkan HAL is present" into nyc-dev
am:
9ffa1a4
* commit '
9ffa1a4da16edc23067070f5605917ddd57739e8':
libvulkan: Use a stub HAL when no real Vulkan HAL is present
Change-Id: Id0993d467fcc234c85cbec3cda3db7fe791dab2c
Jesse Hall [Tue, 12 Apr 2016 00:36:45 +0000 (00:36 +0000)]
Merge "libvulkan: Use a stub HAL when no real Vulkan HAL is present" into nyc-dev
Jesse Hall [Mon, 11 Apr 2016 20:51:38 +0000 (13:51 -0700)]
libvulkan: Use a stub HAL when no real Vulkan HAL is present
This stub HAL enumerates zero VkPhysicalDevices. This allows a
VkInstane to be created and queried for physical devices successfully
even on devices without a Vulkan driver. Handling this with a stub HAL
avoids the need for NULL HAL and NULL driver function pointer checks
in many places throughout the loader, which would be more error-prone.
Fixes bug:
28100673
Change-Id: I76bea975929a85eda354730d6c815567b412b160
Felipe Leme [Mon, 11 Apr 2016 22:40:47 +0000 (22:40 +0000)]
Merge "Setting v1-dev4 as default." into nyc-dev
am:
1e451b2
* commit '
1e451b2d63e318d4c6724876bfff165776d6757d':
Setting v1-dev4 as default.
Change-Id: I74a5edfad36f984f85c220e768991c6a854f3619
Felipe Leme [Mon, 11 Apr 2016 22:07:45 +0000 (22:07 +0000)]
Merge "Setting v1-dev4 as default." into nyc-dev
Chia-I Wu [Mon, 11 Apr 2016 21:01:28 +0000 (21:01 +0000)]
Merge changes I33360e15,I2f102fa9,If44c40f8,Ic7bc29ef into nyc-dev
am:
2b97c06
* commit '
2b97c063bae8446f2b539e663590399ff0251de8':
vulkan: use CamelCase() for CreateInfoWrapper
vulkan: use CamelCase() for LayerChain
vulkan: use CamelCase() for OverrideExtensionNames
vulkan: use CamelCase() for OverrideLayerNames
Change-Id: I0521aea2cb98c70a27fddce35f561deb4842eaba
Felipe Leme [Mon, 11 Apr 2016 20:45:18 +0000 (13:45 -0700)]
Setting v1-dev4 as default.
BUG:
27618668
Change-Id: I59c3a7c256c4d059ae3c29411120d3e9c9a5d995
Chia-I Wu [Mon, 11 Apr 2016 20:36:47 +0000 (20:36 +0000)]
Merge changes I33360e15,I2f102fa9,If44c40f8,Ic7bc29ef into nyc-dev
* changes:
vulkan: use CamelCase() for CreateInfoWrapper
vulkan: use CamelCase() for LayerChain
vulkan: use CamelCase() for OverrideExtensionNames
vulkan: use CamelCase() for OverrideLayerNames
Peng Xu [Mon, 11 Apr 2016 19:48:02 +0000 (19:48 +0000)]
Merge "Refactor sensor list in SensorService" into nyc-dev
am:
df4f17e
* commit '
df4f17e100e56a1f2964797ad83499e07ba9e062':
Refactor sensor list in SensorService
Change-Id: Icf06548c50ae7bf38590dc32a212252b95b606a7
Peng Xu [Mon, 11 Apr 2016 19:32:42 +0000 (19:32 +0000)]
Merge "Refactor sensor list in SensorService" into nyc-dev
Peng Xu [Wed, 6 Apr 2016 06:46:03 +0000 (23:46 -0700)]
Refactor sensor list in SensorService
Refactor sensor lists management logic in sensorservice:
* Factor all sensor list management code into a separate class.
* Remove error-prone repeated sensor lists.
* Solve synchronization issue when sensor is added or removed during runtime.
* Switch to STL containers.
Bug: b/
27911774
Change-Id: I94d5571e1fa3166dbe893ffac2a2a7584be6349c
Dan Stoza [Mon, 11 Apr 2016 17:54:42 +0000 (17:54 +0000)]
Merge "DispSync: Always resync after inactivity" into nyc-dev
am:
7e5e128
* commit '
7e5e1287276efba71cceec75c495c21ecec4f147':
DispSync: Always resync after inactivity
Change-Id: I6ed67ed8139c4ab1b07e524877db505635fc22eb
Dan Stoza [Mon, 11 Apr 2016 17:43:45 +0000 (17:43 +0000)]
Merge "DispSync: Always resync after inactivity" into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 06:41:19 +0000 (06:41 +0000)]
Merge "Let\'s try casting to fix the build." into nyc-dev
am:
6c444a4
* commit '
6c444a40ec9725880580c789500cc069e3121d89':
Let's try casting to fix the build.
Change-Id: Iee3fbfa51645706fabecff7a8c2fcd6fb787eb08
Jeff Sharkey [Mon, 11 Apr 2016 06:32:02 +0000 (06:32 +0000)]
Merge "Let's try casting to fix the build." into nyc-dev
Jeff Sharkey [Mon, 11 Apr 2016 06:30:24 +0000 (00:30 -0600)]
Let's try casting to fix the build.
Change-Id: Icd55458caefa27823b770f499a172ca96d1f7a0b
Jeff Sharkey [Mon, 11 Apr 2016 06:20:08 +0000 (06:20 +0000)]
Merge "Use inode numbers for CE storage, fix sizes." into nyc-dev
am:
82b4c7a
* commit '
82b4c7a92cfb2482deb57a328f5eb9c95d5fdc5e':
Use inode numbers for CE storage, fix sizes.
Change-Id: I1c1afd079765088a03db70d6d558b9f3bdb16e6e
Jeff Sharkey [Mon, 11 Apr 2016 06:12:36 +0000 (06:12 +0000)]
Merge "Use inode numbers for CE storage, fix sizes." into nyc-dev
Chia-I Wu [Mon, 11 Apr 2016 05:55:56 +0000 (13:55 +0800)]
vulkan: use CamelCase() for CreateInfoWrapper
Change-Id: I33360e15dd0bfb038235d7600587d39d50cea0a8
Chia-I Wu [Mon, 11 Apr 2016 05:52:39 +0000 (13:52 +0800)]
vulkan: use CamelCase() for LayerChain
Change-Id: I2f102fa97e3c976fa411b4e6bdc83dacfa243af7
Chia-I Wu [Mon, 11 Apr 2016 05:47:31 +0000 (13:47 +0800)]
vulkan: use CamelCase() for OverrideExtensionNames
Change-Id: If44c40f87b1e3e2eb69d12543a7f3b3036291c88
Chia-I Wu [Mon, 11 Apr 2016 05:44:13 +0000 (13:44 +0800)]
vulkan: use CamelCase() for OverrideLayerNames
Change-Id: Ic7bc29efc1ae5b734ebfc692c441b9537134ccb2
Jeff Sharkey [Mon, 11 Apr 2016 02:51:40 +0000 (20:51 -0600)]
Use inode numbers for CE storage, fix sizes.
Certain operations, such as clearing/destroying app data, or just
counting on-disk size, require us to know the CE storage directory
of a particular app. To facilitate these operations, offer a method
to get the inode of a CE directory, and accept that inode number
for later operations.
In previous releases, we started installing apps using a new
directory-based layout, where all app code, unpacked native libraries,
and optimized code is bundled together. So now we only have a single
path to measure for code size.
Start measuring both CE and DE storage data usage for apps, and tweak
the reporting so that empty cache/data directories actually show up
as "0 bytes".
Fix bugs in disk usage counting, since st_blksize has no bearing on
the allocated disk space. Also don't double-count "." and ".."
directories when measuring storage.
Bug:
27828915,
27197819
Change-Id: I350b951f5c24165edb253ac663c9aae020c24dc9
Chia-I Wu [Mon, 11 Apr 2016 02:48:40 +0000 (02:48 +0000)]
Merge changes I21f07545,I73c39cbe,I47b1639c,I4a6268d7,I06be9898, ... into nyc-dev
am:
4ad5c14
* commit '
4ad5c1414b3cfcbe5b3c3b9f21b42f23d99bafba':
vulkan: remove unused loader.{cpp.h}
vulkan: use driver::GetData everywhere
vulkan: move all _Bottom functions
vulkan: add swapchain.h
vulkan: add layers_extensions.h
vulkan: rework CreateInstance_Bottom and related ones
vulkan: rework EnumerateDeviceExtensionProperties_Bottom
vulkan: rework {Create,Destroy}Device_Bottom
vulkan: move AllocateCommandBuffers_Bottom
vulkan: move GetDeviceQueue_Bottom
vulkan: rework DriverDispatchTable
vulkan: rework driver::Get*ProcAddr
vulkan: add VK_ANDROID_native_buffer to vulkan.api
vulkan: move driver::GetDefaultAllocator
vulkan: move driver::OpenHAL
vulkan: move driver::Debuggable
Change-Id: I7039d5192d8adc836ce313cab26ec5a7a8aad50b
Chia-I Wu [Mon, 11 Apr 2016 02:43:44 +0000 (02:43 +0000)]
Merge changes I21f07545,I73c39cbe,I47b1639c,I4a6268d7,I06be9898, ... into nyc-dev
* changes:
vulkan: remove unused loader.{cpp.h}
vulkan: use driver::GetData everywhere
vulkan: move all _Bottom functions
vulkan: add swapchain.h
vulkan: add layers_extensions.h
vulkan: rework CreateInstance_Bottom and related ones
vulkan: rework EnumerateDeviceExtensionProperties_Bottom
vulkan: rework {Create,Destroy}Device_Bottom
vulkan: move AllocateCommandBuffers_Bottom
vulkan: move GetDeviceQueue_Bottom
vulkan: rework DriverDispatchTable
vulkan: rework driver::Get*ProcAddr
vulkan: add VK_ANDROID_native_buffer to vulkan.api
vulkan: move driver::GetDefaultAllocator
vulkan: move driver::OpenHAL
vulkan: move driver::Debuggable
Chia-I Wu [Fri, 25 Mar 2016 23:18:53 +0000 (07:18 +0800)]
vulkan: remove unused loader.{cpp.h}
Change-Id: I21f07545cf286f7e5796d9a6c9642cfdd3001f17
Chia-I Wu [Fri, 25 Mar 2016 23:17:34 +0000 (07:17 +0800)]
vulkan: use driver::GetData everywhere
Move away from the one-liners defined in loader.cpp.
Change-Id: I73c39cbe21aa3b2079f67590bb40f0cd55563f84
Chia-I Wu [Fri, 25 Mar 2016 23:06:44 +0000 (07:06 +0800)]
vulkan: move all _Bottom functions
Move them to vulkan::driver namespace and drop the _Bottom suffix.
Change-Id: I47b1639c4074adb9c0658816f5f1e126df7f685b
Chia-I Wu [Fri, 25 Mar 2016 23:01:55 +0000 (07:01 +0800)]
vulkan: add swapchain.h
Move everything belongs to swapchain.cpp out of loader.h to swapchain.h.
Change-Id: I4a6268d703b60e5661b09917eed129d2d227a63c
Chia-I Wu [Fri, 25 Mar 2016 22:56:45 +0000 (06:56 +0800)]
vulkan: add layers_extensions.h
Move everything for layers_extensions.cpp out of loader.h to
layers_extensions.h, and into vulkan::api namespace.
Remove now unused InstanceExtensionFromName and DeviceExtensionFromName.
Change-Id: I06be98986f40de35e9dffb5499bc1423e9eb3d48
Chia-I Wu [Thu, 24 Mar 2016 08:05:56 +0000 (16:05 +0800)]
vulkan: rework CreateInstance_Bottom and related ones
The reworked driver::CreateInstance will
- call HAL's EnumerateInstanceExtensionProperties and filter out
extensions unknown to HAL, if there is any extension enabled.
We do not expect or enumerate any HAL layer yet as that requires some
works to layers_extensions.cpp.
The reworked driver::EnumerateInstanceExtensionProperties instead will
return all extensions enumerated by HAL, after prepending VK_KHR_surface
and VK_KHR_android_surface to them. This allows extensions unknown to the
loader to be enumerated.
Change-Id: I73b496582a773e06c7b79f0c5c166700737f2953
Chia-I Wu [Thu, 24 Mar 2016 08:16:21 +0000 (16:16 +0800)]
vulkan: rework EnumerateDeviceExtensionProperties_Bottom
The reworked driver::EnumerateDeviceExtensionProperties will simply return
all extensions enumerated by HAL, with VK_ANDROID_native_buffer replaced
by VK_KHR_swapchain. This allows extensions unknown to the loader to be
enumerated.
Change-Id: Iceed8ee3f16a968d005ae3ba42f1bd1839c2ab9f
Chia-I Wu [Thu, 24 Mar 2016 08:38:58 +0000 (16:38 +0800)]
vulkan: rework {Create,Destroy}Device_Bottom
The reworked driver::CreateDevice will
- use the providied pAllocator,
- call HAL's EnumerateDeviceExtensionProperties and filter out extensions
unknown to HAL, if there is any extension enabled.
We do not expect or enumerate any HAL layer yet as that requires some
works to layers_extensions.cpp.
Change-Id: I3ba4019d18dfed994d7037d95825bf54096f2a5d
Chia-I Wu [Sun, 10 Apr 2016 22:43:32 +0000 (22:43 +0000)]
Merge "vulkan: check for unsupported extensions" into nyc-dev
am:
a70a421
* commit '
a70a4214d85dec0d27e918c977dabd488a5c20e5':
vulkan: check for unsupported extensions
Change-Id: I0ca1c2293e0a0878d2d38abe9c79499f4b364dda
Chia-I Wu [Sun, 10 Apr 2016 22:43:32 +0000 (22:43 +0000)]
Merge "vulkan: avoid double-free in InitSharedPtr" into nyc-dev
am:
8391efa
* commit '
8391efaf4d43da899a5183f03d4fc3a683125612':
vulkan: avoid double-free in InitSharedPtr
Change-Id: Idf7416b4b035988a45a6b4e93bd8d8f752a08f43
Chia-I Wu [Sun, 10 Apr 2016 22:38:53 +0000 (22:38 +0000)]
Merge "vulkan: check for unsupported extensions" into nyc-dev
Chia-I Wu [Sun, 10 Apr 2016 22:37:54 +0000 (22:37 +0000)]
Merge "vulkan: avoid double-free in InitSharedPtr" into nyc-dev
Chia-I Wu [Thu, 7 Apr 2016 07:01:55 +0000 (15:01 +0800)]
vulkan: avoid double-free in InitSharedPtr
When std::shared_ptr fails to allocate its internal data, it deletes the
managed object automatically. We should not call obj->common.decRef on
std::bad_alloc.
Bug:
28039233
Change-Id: I1fe00c16e83e426602eac96d8b86afb4fd4830e6
Hangyu Kuang [Sat, 9 Apr 2016 05:17:02 +0000 (05:17 +0000)]
Merge "media: update VP9 CodecProfileLevel" into nyc-dev
am:
cd582bb
* commit '
cd582bb1180543d348a5ed412a64aa181fac638f':
media: update VP9 CodecProfileLevel
Change-Id: Ia05aa9630adfdc70af6a08acaa9b73afa1f78229
Hangyu Kuang [Sat, 9 Apr 2016 05:11:43 +0000 (05:11 +0000)]
Merge "media: update VP9 CodecProfileLevel" into nyc-dev
Jorim Jaggi [Sat, 9 Apr 2016 03:56:00 +0000 (03:56 +0000)]
Death to synchronous transactions (1/2)
am:
c6a607a
* commit '
c6a607aa7ab96f6b1bac487cffd1899e1f1cdcf5':
Death to synchronous transactions (1/2)
Change-Id: Ie31f3fe60ae1f5a3f2b2c070f19bc82743de1e46
Jorim Jaggi [Fri, 8 Apr 2016 21:35:12 +0000 (14:35 -0700)]
Death to synchronous transactions (1/2)
Bug:
28068298
Change-Id: I0a9a212a4b19793cf2830193152c53c03b651970
Hangyu Kuang [Thu, 7 Apr 2016 22:55:41 +0000 (15:55 -0700)]
media: update VP9 CodecProfileLevel
Bug:
27969307
Change-Id: I214e0aeb70e1f5a1520eea9ff206c13abd1a3a2a
Dan Stoza [Sat, 9 Apr 2016 01:01:19 +0000 (01:01 +0000)]
Merge changes I0f07043f,Ib4635ee4,I472ad9f0 into nyc-dev
am:
97a46df
* commit '
97a46df0ee9708822f190a76047c490f54c199cd':
Plumb HDR capabilities up to SurfaceComposerClient
HWC2: Add getHdrCapabilities to C++ shim
HWC2: Add getHdrCapabilities stub to adapter
Change-Id: Ia3ad51ebcedf563dbc1275299de125571aa10930
Dan Stoza [Fri, 8 Apr 2016 23:13:01 +0000 (23:13 +0000)]
Merge changes I0f07043f,Ib4635ee4,I472ad9f0 into nyc-dev
* changes:
Plumb HDR capabilities up to SurfaceComposerClient
HWC2: Add getHdrCapabilities to C++ shim
HWC2: Add getHdrCapabilities stub to adapter
Dan Stoza [Thu, 24 Mar 2016 16:31:08 +0000 (09:31 -0700)]
Plumb HDR capabilities up to SurfaceComposerClient
Plumbs HDR capabilities up from HWC2 through SurfaceFlinger and
ISurfaceComposer to SurfaceComposerClient.
Bug:
25684127
Change-Id: I0f07043ff42bfc7a159f785fee3e84936dc3c280
Dan Stoza [Wed, 16 Mar 2016 19:23:40 +0000 (12:23 -0700)]
HWC2: Add getHdrCapabilities to C++ shim
Adds support for the getHdrCapabilities call to the HWC2 C++ shim.
Bug:
25684127
Change-Id: Ib4635ee437a06b48945e7f0328492c1e74e27aaa
Josh Gao [Fri, 8 Apr 2016 18:28:38 +0000 (18:28 +0000)]
Merge "Don\'t include <sys/sysconf.h>." am:
ac6335c
am:
2ccbf98
* commit '
2ccbf98d36f7c3024777b31f5160cb00f42c8672':
Don't include <sys/sysconf.h>.
Change-Id: I62cb235634a9682331800a006ae1033f9f14281d
Josh Gao [Fri, 8 Apr 2016 18:16:44 +0000 (18:16 +0000)]
Merge "Don\'t include <sys/sysconf.h>."
am:
ac6335c
* commit '
ac6335cdc222a0a2e84c0ff99b8821d4c58ef4d2':
Don't include <sys/sysconf.h>.
Change-Id: Icf0332786d942da1cccaff8d4224bf53e6ddd3ed
Josh Gao [Fri, 8 Apr 2016 17:59:15 +0000 (17:59 +0000)]
Merge "Don't include <sys/sysconf.h>."
Narayan Kamath [Fri, 8 Apr 2016 11:51:49 +0000 (11:51 +0000)]
Merge "installd: log failed unlinks." into nyc-dev
am:
45d15b8
* commit '
45d15b835738497f812bec55affc9a1cba4ec343':
installd: log failed unlinks.
Change-Id: Ic03a04b4451be24086614e08877853c9157b6d0a
Narayan Kamath [Fri, 8 Apr 2016 11:47:02 +0000 (11:47 +0000)]
Merge "installd: log failed unlinks." into nyc-dev
Ruchi Kandoi [Fri, 8 Apr 2016 01:13:26 +0000 (01:13 +0000)]
Merge "batteryservice: Expose Charge Counters." into nyc-dev
am:
f99c6f4
* commit '
f99c6f4b0cd051558def409f9cd4ade628272588':
batteryservice: Expose Charge Counters.
Change-Id: If327ab95cdfdd3d5819c4dc6242db94255840c43
Ruchi Kandoi [Fri, 8 Apr 2016 01:09:22 +0000 (01:09 +0000)]
Merge "batteryservice: Expose Charge Counters." into nyc-dev
Josh Gao [Fri, 8 Apr 2016 00:33:02 +0000 (17:33 -0700)]
Don't include <sys/sysconf.h>.
It doesn't exist in any standard, and is hence being moved. <unistd.h>
exposes everything in it already, anyway.
Bug: http://b/
28067717
Change-Id: I258c607ef8799ec267151f424be27c72e295e3b6
Dan Stoza [Wed, 16 Mar 2016 19:33:52 +0000 (12:33 -0700)]
HWC2: Add getHdrCapabilities stub to adapter
Adds a minimal getHdrCapabilities stub to the HWC2On1Adapter, which
always returns 0 supported HDR types (as per the HWC2 spec).
Bug:
25684127
Change-Id: I472ad9f08d1b97d5de69d044790badf3af60da72
Dan Stoza [Tue, 5 Apr 2016 23:45:26 +0000 (16:45 -0700)]
DispSync: Always resync after inactivity
Changes DispSync to enable hardware vsync immediately when new frames
arrive after a period of inactivity.
No matter how hard we try, we can't avoid drifting over time without
being able to detect error based on display retire fences. By enabling
hardware vsync immediately, we avoid having a weird period or phase
offset relative to hardware while we retrain the model. Once the model
has locked, we turn hardware vsync back off to save power (until we
detect drift again).
Bug:
26255070
Change-Id: If4dd17c2d541015c730f47d824359d7cb4b52c3c
Narayan Kamath [Thu, 7 Apr 2016 09:42:41 +0000 (10:42 +0100)]
installd: log failed unlinks.
bug:
28054110
Change-Id: Id46aacba293c81bb3bb6a0b9721b9b4fe11ed652
Chia-I Wu [Thu, 24 Mar 2016 08:29:51 +0000 (16:29 +0800)]
vulkan: move AllocateCommandBuffers_Bottom
Move it from loader.cpp to driver.cpp and rename it to
driver::AllocateCommandBuffers. No functional change.
Change-Id: I0abdca7dea128df0b313b90cfb5d5825566fc790
Chia-I Wu [Thu, 24 Mar 2016 08:24:40 +0000 (16:24 +0800)]
vulkan: move GetDeviceQueue_Bottom
Move it from loader.cpp to driver.cpp and rename it to
driver::GetDeviceQueue. No functional change.
Change-Id: Ide8ebe044e62b8ef6fc64ac03dcc1d920f5bf9a6
Chia-I Wu [Thu, 24 Mar 2016 05:01:16 +0000 (13:01 +0800)]
vulkan: rework DriverDispatchTable
Generate {Instance,Device}DriverTable from code-generator.tmpl to replace
dispatch.tmpl entirely. The new code avoids initializing
VK_ANDROID_native_buffer entries when the extension is not enabled. The
separation of instance and device driver tables also allows us to
initialize the device driver table with vkGetDeviceProcAddr, which is
expected to return more efficient function pointers on properly
implemented HALs.
CreateInstance_Bottom always has a potential resource leak when the
HAL-created instance does not contain HWVULKAN_DISPATCH_MAGIC.
CreateDevice_Bottom now has the same issue. Both of them will be fixed in
following commits.
Change-Id: If7800ef23098121f1fff643a2c5224c2c9be0711
Chia-I Wu [Thu, 24 Mar 2016 01:11:06 +0000 (09:11 +0800)]
vulkan: rework driver::Get*ProcAddr
Introduce driver::ProcHook which is a struct to describe an intercepted
function. Given a function name, GetProcHook returns a ProcHook if the
function is intercepted. NULL otherwise.
A ProcHook has three function pointers. ProcHook::proc points to the real
intercepting function. ProcHook::disabled_proc points to a no-op function
that logs an error. ProcHook::checked_proc points to a trampoline that
calls either ProcHook::proc or ProcHook::disabled_proc.
For core functions, driver::Get*ProcAddr simply return ProcHook::proc.
For extension functions, driver::Get*ProcAddr return ProcHook::proc when
the extension is known to be enabled. They return ProcHook::disabled_proc
when the extension is known to be disabled. Finally, they return
ProcHook::checked_proc when they do not know if the extension is enabled
or not.
All ProcHooks as well as their disabled_proc/checked_proc are generated in
driver_gen.cpp. This allows us to get rid of all hand-written "_Disabled"
functions, all no-op "_Bottom" functions, and special cases for
VK_ANDROID_native_buffer. The reworked driver::Get*ProcAddr also detects
more applications' errors and logs them.
Change-Id: I8e6f476f450688b5547fd75243c66cb603c516b5
Chia-I Wu [Mon, 21 Mar 2016 23:38:20 +0000 (07:38 +0800)]
vulkan: add VK_ANDROID_native_buffer to vulkan.api
Change-Id: I5d90918b10264b9d2cf8b73dc7a7c983b6721862
Chia-I Wu [Thu, 24 Mar 2016 07:09:38 +0000 (15:09 +0800)]
vulkan: move driver::GetDefaultAllocator
Move it from loader.cpp to driver.cpp. No functional change.
Change-Id: I8c9bb5315c29ff69bfd971ac8e1264fb8329a811
Chia-I Wu [Thu, 24 Mar 2016 07:01:52 +0000 (15:01 +0800)]
vulkan: move driver::OpenHAL
Move it from loader.cpp to driver.cpp. HAL loading is now done in
driver.cpp while HAL extension queries are still done in loader.cpp.
Change-Id: I15d7ead98497adacb1bd798522f057ff6bf16909
Chia-I Wu [Thu, 24 Mar 2016 06:55:27 +0000 (14:55 +0800)]
vulkan: move driver::Debuggable
Move it from loader.cpp to driver.cpp. No functional change.
Change-Id: I455e798d6001f9719d378ae0295f2b4b181b0c09
Chia-I Wu [Wed, 6 Apr 2016 06:17:48 +0000 (14:17 +0800)]
vulkan: check for unsupported extensions
Return VK_ERROR_EXTENSION_NOT_PRESENT when an app attempts to enable an
unsupported extension. This fixes a regression introduced by my top
rewrite (commit
0c20324: vulkan: rewrite top of loader).
Since we do not cache HAL extensions, each vkCreateInstance or
vkCreateDevice call is preceded by two extension enumeration calls
internally.
Change-Id: I5342c1a5c9a5452dd2bc52933a5ee558db174048
Andrii Kulian [Thu, 7 Apr 2016 01:53:05 +0000 (01:53 +0000)]
Merge "Caps Lock toggle with Meta + Alt (1/2)" into nyc-dev
am:
3e3a11a
* commit '
3e3a11a7805efb61f482914abc2ff8f01d5ec1b0':
Caps Lock toggle with Meta + Alt (1/2)
Change-Id: I23229acb384dbcbd471a6bc1f8230dc4b2ec43ce
Andrii Kulian [Thu, 7 Apr 2016 01:43:02 +0000 (01:43 +0000)]
Merge "Caps Lock toggle with Meta + Alt (1/2)" into nyc-dev
Ruchi Kandoi [Thu, 7 Apr 2016 00:53:23 +0000 (17:53 -0700)]
batteryservice: Expose Charge Counters.
Bug:
27174034
Change-Id: Ib45a5258c3a8cbc706d207486310570511a03e6e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Dan Stoza [Wed, 6 Apr 2016 22:46:44 +0000 (22:46 +0000)]
Merge "SF/HWC2: Reorder makeCurrent to avoid deadlock" into nyc-dev
am:
79632ee
* commit '
79632ee48a8cddf31a1ec15c0c5217b3d3608622':
SF/HWC2: Reorder makeCurrent to avoid deadlock
Change-Id: Icbb2f2178e21c213ff879e0a04c4bfda25583d28
Dan Stoza [Wed, 6 Apr 2016 22:40:21 +0000 (22:40 +0000)]
Merge "SF/HWC2: Reorder makeCurrent to avoid deadlock" into nyc-dev
Jesse Hall [Wed, 6 Apr 2016 22:10:04 +0000 (22:10 +0000)]
Merge changes from topic \'vkjson\' into nyc-dev
am:
16ce3ce
* commit '
16ce3cec53f3daf18f851c776e50e146f2dfacef':
GpuService: Add 'help' and 'vkjson' commands
Add service "gpu" in the SurfaceFlinger process
Change-Id: I46b4c2975b7e458c91e08920762906b368057084
Jesse Hall [Wed, 6 Apr 2016 22:01:25 +0000 (22:01 +0000)]
Merge changes from topic 'vkjson' into nyc-dev
* changes:
GpuService: Add 'help' and 'vkjson' commands
Add service "gpu" in the SurfaceFlinger process
Dan Stoza [Wed, 6 Apr 2016 21:05:37 +0000 (14:05 -0700)]
SF/HWC2: Reorder makeCurrent to avoid deadlock
Now that we are deferring the release of FramebufferSurface buffers
(so that we can return a non-speculative fence), we end up holding
two acquired buffers during the call into HWComposer::commit (whereas
we previously would have only been holding one, with the other having
been released). This means that if the EGL implementation dequeues a
buffer as part of eglMakeCurrent, neither of the FramebufferSurface
buffers will be free, and the call to dequeueBuffer will block.
This change fixes that issue by reordering eglMakeCurrent to occur
after the deferred release.
Bug:
25684127
Change-Id: I6ec55b3f7b7d0e0f5be6029751cb086feeb52fbe
Greg Kaiser [Tue, 5 Apr 2016 23:33:03 +0000 (23:33 +0000)]
Merge "SensorService: Remove unused function" into nyc-dev
am:
10a91a5
* commit '
10a91a5a5b0c9e992a3ccf368ead9e27be75b15e':
SensorService: Remove unused function
Change-Id: Ieacd16f693c3d9923015b38d2bffe5a47a5077d5
Greg Kaiser [Tue, 5 Apr 2016 22:10:38 +0000 (22:10 +0000)]
Merge "SensorService: Remove unused function" into nyc-dev
Greg Kaiser [Tue, 5 Apr 2016 18:45:06 +0000 (11:45 -0700)]
SensorService: Remove unused function
We remove the unused getSensorRecord function. This function
was accessing the mActiveSensors field without obtaining a lock.
We're looking to simplify this code, so we just remove this instead
of trying to fix it.
Change-Id: I8c4ed3cc7ed17d90aa9a5d7f33f9ab9238f9403f
Ashley Smith [Tue, 5 Apr 2016 18:42:09 +0000 (18:42 +0000)]
Merge "Updating wearable_core_hardware to support device administration." into nyc-dev
am:
cf463a9
* commit '
cf463a9b97dee1ad91f7325b519ed84de3a0b61d':
Updating wearable_core_hardware to support device administration.
Change-Id: Ief3e78ecb1a76ee94cd323bb233e3e4e2aa038a6
Ashley Smith [Tue, 5 Apr 2016 18:33:20 +0000 (18:33 +0000)]
Merge "Updating wearable_core_hardware to support device administration." into nyc-dev
Roland Levillain [Tue, 5 Apr 2016 17:04:05 +0000 (17:04 +0000)]
Close profile before leaving android::installd::clear_profile.
am:
64b59cc
* commit '
64b59cc1c89225813295d1b5d6bf4183615da204':
Close profile before leaving android::installd::clear_profile.
Change-Id: I52cf3109ad82c5f45f5880050b687e0fcf8607ca
Roland Levillain [Tue, 5 Apr 2016 15:41:12 +0000 (16:41 +0100)]
Close profile before leaving android::installd::clear_profile.
The profile file descriptor used to be kept open and to
produce SElinux denials when installd ran dex2oat, as that
file descriptor was passed accross security domains.
Bug:
27943553
Change-Id: Ie025082f97c2736156bd5069d7a22aacde86f039