OSDN Git Service
Peng Xu [Tue, 13 Sep 2016 18:58:18 +0000 (18:58 +0000)]
Merge "Sensor: Make switching from data injection mode to normal mode more productive"
am:
e6a4e9b04e
Change-Id: Ic5b3c3bb1856d70a0e12878f8ecdd2cf81868152
Peng Xu [Tue, 13 Sep 2016 18:52:47 +0000 (18:52 +0000)]
Merge "Sensor: Make switching from data injection mode to normal mode more productive"
Dan Stoza [Tue, 13 Sep 2016 16:33:01 +0000 (16:33 +0000)]
Merge changes I5041c541,I0eeafc99,Ie982d375
am:
30fcc9fc7f
Change-Id: If83104d4b621a6e29782f45f62d40d2899e480b5
Dan Stoza [Tue, 13 Sep 2016 16:33:00 +0000 (16:33 +0000)]
Squashed: gralloc1/binder/requestor
am:
f62eaf5994
Change-Id: Icc0f8ccf6ce1799ce83655cfc60eb5f5da0d9f12
Dan Stoza [Tue, 13 Sep 2016 16:32:49 +0000 (16:32 +0000)]
libui: Add Gralloc1On0Adapter and C++ shim
am:
eb03fd3a8b
Change-Id: I3bc1a4a54d4c9b7d8de0fb45140e7f3d8c194319
Dan Stoza [Tue, 13 Sep 2016 16:32:37 +0000 (16:32 +0000)]
libagl: Switch from gralloc to GraphicBufferMapper
am:
204240a88b
Change-Id: I9f43911878549a281050b86af9b4430a35b15c04
Dan Stoza [Tue, 13 Sep 2016 16:27:14 +0000 (16:27 +0000)]
Merge changes I5041c541,I0eeafc99,Ie982d375
* changes:
Squashed: gralloc1/binder/requestor
libui: Add Gralloc1On0Adapter and C++ shim
libagl: Switch from gralloc to GraphicBufferMapper
Feng Yu [Tue, 13 Sep 2016 15:47:16 +0000 (15:47 +0000)]
Merge changes I1b74d58b,I38c6e8bc
am:
9f41107732
Change-Id: Ib1a09ccb5773c4f6c01ad1d39b43c6f85f16092d
Arve Hjnnevg [Tue, 13 Sep 2016 15:47:15 +0000 (15:47 +0000)]
ServiceManager: Allow system services running as secondary users to add services
am:
6b9c6d23f6
Change-Id: I556897757f0a1d019bbf269e8e32644d346119ba
Arve Hjnnevg [Tue, 13 Sep 2016 15:47:03 +0000 (15:47 +0000)]
ServiceManager: Restore basic uid check
am:
5fa90a063f
Change-Id: I64b3db319f75d1f07e8439e393e5c3c8d5b192e2
Feng Yu [Tue, 13 Sep 2016 15:39:04 +0000 (15:39 +0000)]
Merge changes I1b74d58b,I38c6e8bc
* changes:
ServiceManager: Allow system services running as secondary users to add services
ServiceManager: Restore basic uid check
Arve Hjønnevåg [Thu, 18 Aug 2016 22:42:35 +0000 (15:42 -0700)]
ServiceManager: Allow system services running as secondary users to add services
This should be reverted when all system services have been cleaned up to not
do this. A process looking up a service while running in the background will
see the service registered by the active user (assuming the service is
registered on every user switch), not the service registered by the user that
the process itself belongs to.
BUG:
30795333
Change-Id: I1b74d58be38ed358f43c163692f9e704f8f31dbe
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Dan Stoza [Thu, 2 Jun 2016 01:21:44 +0000 (18:21 -0700)]
Squashed: gralloc1/binder/requestor
This is a combination of the following three commits:
libui: Convert Allocator and Mapper to gralloc1
Converts GraphicBufferAllocator and GraphicBufferMapper to speak
gralloc 1.0 (via the C++ shim and optionally the 1On0 adapter) instead
of gralloc 0.x.
-----
Create graphic buffer using binder interfaces
Using binder interfaces rather than directly allocating the buffer prevents
SELinux warnings.
-----
Add requestor name to GraphicBuffer alloc metadata
Adds a requestor name (usually the BufferQueue consumer's name) to the
metadata that GraphicBufferAllocator stores on allocation so that
`dumpsys SurfaceFlinger` can attempt to attribute buffer usage to the
correct client.
Bug:
28401203
Bug:
29402015
Bug:
30776557
Dan Stoza [Mon, 11 Jan 2016 23:21:07 +0000 (15:21 -0800)]
libui: Add Gralloc1On0Adapter and C++ shim
Adds an adapter which provides the gralloc1 interface on top of a
gralloc 0.x device as well as a C++ shim which wraps a gralloc1 device
and provides a somewhat nicer interface to the rest of the system.
This has also been squashed with a later commit that added mutexes to
protect both the buffer list and the descriptor list from concurrent
access.
Bug:
28401203
Bug:
29420918
Change-Id: I0eeafc998b56e2e2fc39de6fad41e3ed2e19658a
Chih-Hung Hsieh [Mon, 12 Sep 2016 18:58:12 +0000 (18:58 +0000)]
Merge "Fix google-explicit-constructor warnings in surfaceflinger."
am:
5e703a6ad0
Change-Id: I758fe34b9d89c5d2c343830d6521b7b2217cdbde
Treehugger Robot [Mon, 12 Sep 2016 18:33:16 +0000 (18:33 +0000)]
Merge "Fix google-explicit-constructor warnings in surfaceflinger."
David Brazdil [Mon, 12 Sep 2016 15:05:51 +0000 (15:05 +0000)]
Merge "installd: Create VDEX files and pass their FDs to dex2oat"
am:
a586216175
Change-Id: I932037dce82d2b58f96b38318914497cf89df5b1
David Brazdil [Mon, 12 Sep 2016 14:57:19 +0000 (14:57 +0000)]
Merge "installd: Create VDEX files and pass their FDs to dex2oat"
Chih-Hung Hsieh [Sun, 11 Sep 2016 00:44:41 +0000 (00:44 +0000)]
Merge "Fix google-explicit-constructor warnings in dumpstate."
am:
a70396971e
Change-Id: I3f1a3e40e56070f18e7b62dea9b364724581cc3a
Treehugger Robot [Sun, 11 Sep 2016 00:38:09 +0000 (00:38 +0000)]
Merge "Fix google-explicit-constructor warnings in dumpstate."
Dan Stoza [Fri, 8 Jan 2016 18:52:16 +0000 (10:52 -0800)]
libagl: Switch from gralloc to GraphicBufferMapper
Removes all direct references to the gralloc module from libagl and
uses the GraphicBufferMapper class instead when locking and unlocking
buffers.
Also a couple of minor code cleanups to eliminate warnings.
Bug:
28401203
Change-Id: Ie982d375b3152d5f677ab54c2067179b8d34c06d
gaoshang [Fri, 9 Sep 2016 14:49:36 +0000 (14:49 +0000)]
Merge "redirect to call assignPointerIds if there is id < 0 case"
am:
85598ce5ac
Change-Id: I7a00040cda005d72e6dbb80745e9c6fa7bc7077b
Treehugger Robot [Fri, 9 Sep 2016 14:44:30 +0000 (14:44 +0000)]
Merge "redirect to call assignPointerIds if there is id < 0 case"
David Brazdil [Thu, 8 Sep 2016 10:55:48 +0000 (11:55 +0100)]
installd: Create VDEX files and pass their FDs to dex2oat
ART now produces a new output file called VDEX, produced alongside the
existing OAT file. This patch updates installd to compute the VDEX's
path, open it and pass the file descriptor to dex2oat.
Bug:
30937355
Change-Id: Ib5c327f1f7a36cfa0b89084d5c01b6da9f8108f2
Peng Xu [Thu, 8 Sep 2016 21:33:37 +0000 (21:33 +0000)]
Merge "Fix google-explicit-constructor warnings in sensorservice."
am:
215d7ab7d8
Change-Id: Ie27baf6308d8bb6f9bedcfc4eebbaee3117e5564
Peng Xu [Thu, 8 Sep 2016 21:29:52 +0000 (21:29 +0000)]
Merge "Fix google-explicit-constructor warnings in sensorservice."
Aniroop Mathur [Wed, 31 Aug 2016 17:29:44 +0000 (22:59 +0530)]
Sensor: Make switching from data injection mode to normal mode more productive
Currently, when sensor service mode is switched back to normal mode from data
injection mode, request to enable the sensors is passed first to HAL and then
request to change mode is passed. With this, request to enable the sensors is
actually non-effective because sensor service is still in data injection mode
so HAL could not pass the request further to driver as otherwise real and
recorded data gets mixed up.
Therefore, lets first make request to set mode and then make request to enable
the earlier enabled sensors.
For example: Testing Auto Rotation algorithm,
- Auto Rotation enabled --> real data production
- Sensor service mode changed to data injection --> real data stopped
- Played recorded data --> AR algorithm tested with recorded data
- Sensor service mode changed to normal --> mode changed succesffuly,
but auto rotation not working again although expected to work in normal mode.
Change-Id: Id01b73e2aed85ed44314b8d632c096b21b62423f
Signed-off-by: Aniroop Mathur <a.mathur@samsung.com>
David Brazdil [Wed, 7 Sep 2016 09:23:17 +0000 (09:23 +0000)]
Merge "installd: Simplify Dalvik cache path creation"
am:
ad95fc06aa
Change-Id: Ia4b958f09662de37f8267030b7a3919b92550cc7
David Brazdil [Wed, 7 Sep 2016 09:16:44 +0000 (09:16 +0000)]
Merge "installd: Simplify Dalvik cache path creation"
Mathieu Chartier [Wed, 7 Sep 2016 06:13:06 +0000 (06:13 +0000)]
Merge "Revert "Don't use profiles with vm safe mode""
am:
60e97a4bd4
Change-Id: Ia1a6395ae26733028d1c3487332400c3000de2bb
Treehugger Robot [Wed, 7 Sep 2016 06:08:13 +0000 (06:08 +0000)]
Merge "Revert "Don't use profiles with vm safe mode""
Mathieu Chartier [Tue, 6 Sep 2016 22:22:13 +0000 (15:22 -0700)]
Revert "Don't use profiles with vm safe mode"
Reason for reverting is that it is no longer necessary since
https://android-review.googlesource.com/#/c/269293/
has bene merged.
Bug:
30733908
Test: adb install facebook
Test: adb shell cmd package compile -m speed-profile comb.BBClient
This reverts commit
f513d77b6df0268408ccba654b7c7c978efefc4f.
Change-Id: Ic7eba70c8be4e1392bd0f9eece09b1b6de56540d
Andreas Gampe [Tue, 6 Sep 2016 21:23:06 +0000 (21:23 +0000)]
Merge changes from topic 'cherry_pms_installd'
am:
59ac10df3a
Change-Id: Ifb18d02cfd54ef3c15696832e88e7731f8dc162b
Andreas Gampe [Tue, 6 Sep 2016 21:23:05 +0000 (21:23 +0000)]
Otapreopt: Allow A/B dexopt only when bootcomplete
am:
45cebd0e31
Change-Id: I703a57f334fe50a1ad3236ac5e3fa7ca28d98d6e
Andreas Gampe [Tue, 6 Sep 2016 21:23:04 +0000 (21:23 +0000)]
otapreopt: Collect and print size of artifacts
am:
f1a7ad43cb
Change-Id: I0dbde754de2b25f5d4c29e5510d46b977b532191
Mathieu Chartier [Tue, 6 Sep 2016 21:23:03 +0000 (21:23 +0000)]
Don't use profiles with vm safe mode
am:
f513d77b6d
Change-Id: Idb93e1efd23b972dee294b1019b1ac36e9b49be6
Andreas Gampe [Tue, 6 Sep 2016 21:23:01 +0000 (21:23 +0000)]
Otapreopt: Try to mount vendor partition for A/B OTA
am:
fd12edaeab
Change-Id: Ifefe8e127828fdd9aa023e5b81706cb6b2d02e11
Andreas Gampe [Tue, 6 Sep 2016 21:23:00 +0000 (21:23 +0000)]
Otapreopt: Add init script for A/B artifact move
am:
90dc492207
Change-Id: I26e4d4319a6bff68a81e1204b28afcaefb818f61
Andreas Gampe [Tue, 6 Sep 2016 21:22:59 +0000 (21:22 +0000)]
Otapreopt: Implement new A/B OTA path
am:
d089ca1703
Change-Id: I45b8ff3b3fe06e57189e74673404323e091aac02
Andreas Gampe [Tue, 6 Sep 2016 21:22:57 +0000 (21:22 +0000)]
Installd: Add support for dex2oat very-large-app property
am:
a5cc10a8e8
Change-Id: I95093fbea5480a84f03811b1eea43e6c46bc673c
Andreas Gampe [Tue, 6 Sep 2016 21:22:56 +0000 (21:22 +0000)]
Otapreopt: Send progress updates to update_engine
am:
64c4038586
Change-Id: Ie9d19a6ba4bbc940bf49a2e1c7140222c38e4822
Andreas Gampe [Tue, 6 Sep 2016 21:22:52 +0000 (21:22 +0000)]
Otapreopt: Filter preopted system apps
am:
56f79f9620
Change-Id: Ib4cf2e4a66766d3b1e0ea5ce043a686887b8b65e
Andreas Gampe [Tue, 6 Sep 2016 21:22:51 +0000 (21:22 +0000)]
Installd: Move app image A/B artifact
am:
ab15dbfb4a
Change-Id: Id655507faadeb5e4a27426e2e5eb7330612fd82d
Andreas Gampe [Tue, 6 Sep 2016 21:22:49 +0000 (21:22 +0000)]
Installd: Fix bad merge
am:
69b93aaa31
Change-Id: Ib71543352a17298bc007591c35b79c3ee62dd0fb
Andreas Gampe [Tue, 6 Sep 2016 21:22:48 +0000 (21:22 +0000)]
Installd: Change app image name computation
am:
89b008dfb5
Change-Id: I25123eca2bebafbe90a686d3899cc5589677c48a
Andreas Gampe [Tue, 6 Sep 2016 21:22:47 +0000 (21:22 +0000)]
Installd: Refactor dexopt to scoped file descriptor
am:
6fb5a0179d
Change-Id: Ie4c9371a77bb80c3c2804318094ef47a05e9084f
Andreas Gampe [Tue, 6 Sep 2016 21:22:46 +0000 (21:22 +0000)]
Installd: Remove string-helpers
am:
6db8db9f33
Change-Id: I734a25e519b6e15d2ef2d39525129aeb73526fe2
Andreas Gampe [Tue, 6 Sep 2016 21:22:44 +0000 (21:22 +0000)]
Otapreopt: Fix after shared-library work
am:
548bdb9308
Change-Id: I1f9d1cbcaa2dfe4508442a1785fe11409a59de32
Andreas Gampe [Tue, 6 Sep 2016 21:02:53 +0000 (21:02 +0000)]
Merge changes from topic 'cherry_pms_installd'
* changes:
Otapreopt: Allow A/B dexopt only when bootcomplete
otapreopt: Collect and print size of artifacts
Don't use profiles with vm safe mode
Otapreopt: Try to mount vendor partition for A/B OTA
Otapreopt: Add init script for A/B artifact move
Otapreopt: Implement new A/B OTA path
Installd: Add support for dex2oat very-large-app property
Otapreopt: Send progress updates to update_engine
Otapreopt: Filter preopted system apps
Installd: Move app image A/B artifact
Installd: Fix bad merge
Installd: Change app image name computation
Installd: Refactor dexopt to scoped file descriptor
Installd: Remove string-helpers
Otapreopt: Fix after shared-library work
Andreas Gampe [Wed, 17 Aug 2016 00:43:33 +0000 (17:43 -0700)]
Otapreopt: Allow A/B dexopt only when bootcomplete
Under certain circumstances cmd may not return because it is waiting
for a service manager. Avoid this situation by restricting the otapreopt
script to only do work when the system has completed boot (which
means that a service manager must exist).
Bug:
30797145
Change-Id: Ic1445e20f1ca06fb38e7707771bde818836c3adc
(cherry picked from commit
90ba9eb2f155a4123ec4c8b08863572360d55776)
Andreas Gampe [Sat, 13 Aug 2016 02:35:57 +0000 (19:35 -0700)]
otapreopt: Collect and print size of artifacts
Collect and print the size of artifacts when moving after a reboot.
This helps in diagnosing issues after the fact.
Bug:
30832951
Change-Id: Iee410adf59dcbb74fa4b49edb27d028025cd8bf9
(cherry picked from commit
e7d555267725ca050ddd5e891267a61a55c9e16a)
Mathieu Chartier [Sat, 6 Aug 2016 00:48:12 +0000 (17:48 -0700)]
Don't use profiles with vm safe mode
vm safe mode uses interpret only compiler filter, this filter will
generate a full app image if a profile is also passed down. App
image generation without a profile currently has a bug where uses
library is not pruned correctly.
Bug:
30688277
Change-Id: I60d87d698789583b8ab797eb47d031c96caf6d9b
Test: N5X boot, package compile speed-profile comb.BBClient
(cherry picked from commit
d46d37b8d4f81e3ea60aeb5106d6d83dd3040775)
Andreas Gampe [Tue, 12 Jul 2016 16:47:17 +0000 (09:47 -0700)]
Otapreopt: Try to mount vendor partition for A/B OTA
Vendor apps are usually not preopted, so A/B dexopt should pick
them up. update_engine is not mounting the vendor partition, so
let otapreopt_chroot do the work.
Bug:
25612095
Bug:
29498238
Change-Id: I5a77bdb78a8e478ce10f6c1d0f911a8d6686becb
(cherry picked from commit
0ba073ce81fbe544592e0a3cd526b274e83fdf9f)
Andreas Gampe [Sat, 9 Jul 2016 18:44:12 +0000 (11:44 -0700)]
Otapreopt: Add init script for A/B artifact move
Move the /data/ota -> /data/dalvik-cache move from the zygote into
a minimal shell script. Add an init rc file to execute the script
once /data is mounted. Add Makefile rules to pull these files in
with the rest of the A/B OTA dexopt components.
The move is motivated by the new naming scheme that includes the
slot name. Passing the slot name to the zygote would complicate
the process, while the value is immediately available in the script
through a simple getprop call.
Bug:
25612095
Bug:
28069686
Change-Id: I63e718d488662e1b1de2ce857629cb90aa4f611d
(cherry picked from commit
99e2b263dd0df71b55e86f0aec6657eb38b334e1)
Andreas Gampe [Mon, 27 Jun 2016 21:25:30 +0000 (14:25 -0700)]
Otapreopt: Implement new A/B OTA path
Refactor otapreopt_script, otapreopt_chroot and otapreopt such
that the actual work will be done as a child of the script driven
by update_engine.
The script now uses the new OtaDexoptService command to get the
right parameters for a dexopt call in otapreopt. As we reach
otapreopt_chroot and otapreopt directly, we can add parameters
without tainting the regular installd path. Use this to add the
target slot suffix, and make naming of the A/B artifacts include
the suffix instead of the generic "b."
Otapreopt_chroot startup is slightly complicated because all file
descriptors must be closed. Otherwise, dex2oat needs selinux
permissions to inherit the descriptors from update_engine.
Bug:
25612095
Bug:
28069686
Change-Id: I9d7b86ac8ecfdf91af3800f7e96f41534c0afc0f
(cherry picked from commit
0354bd0eaf24de533e86885b811f816f1e4d15c8)
Andreas Gampe [Mon, 11 Jul 2016 22:19:31 +0000 (15:19 -0700)]
Installd: Add support for dex2oat very-large-app property
To support constrained devices, dex2oat supports a parameter that
can downgrade a compilation to verify-at-runtime. Expose this
through the dalvik.vm.dex2oat-very-large system property.
Bug:
29557002
Change-Id: Iace626a8ec18533d37f84a41c20729fe7e400386
(cherry picked from commit
e21ac2193d4ed1fd9bc4d5328625d3868409fe4d)
Andreas Gampe [Fri, 10 Jun 2016 22:08:53 +0000 (15:08 -0700)]
Otapreopt: Send progress updates to update_engine
Use the new OtaDexoptService progress API to send updates back
to update_engine.
Bug:
25612095
Bug:
29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
(cherry picked from commit
6c05a734ce443cb5effd01120c5a83b93343b6b6)
Andreas Gampe [Wed, 8 Jun 2016 22:11:37 +0000 (15:11 -0700)]
Otapreopt: Filter preopted system apps
The tool will receive requests to compile preopted system apps, as
we can't detect changes right now and need to be conservative. As
some apps cannot be stripped (signed before being preopted), they
can be re-compiled on device, producing stale files that won't be
cleaned up.
Add code to detect this situation and avoid a compile.
Bug:
25612095
Change-Id: I5f489e61b8d4e5b619cbaa01f6c59880479a46cd
(cherry picked from commit
1409090c0a92751f9fe7406a6e043cdbce2ebe4d)
Andreas Gampe [Mon, 6 Jun 2016 22:36:18 +0000 (15:36 -0700)]
Installd: Move app image A/B artifact
In addition to odex, also move art file.
Bug:
25612095
Change-Id: I69f4c2b1e7283c9a9c361f57f5233e66679c5c28
(cherry picked from commit
af8948d90605ad116c965c25e73e0fc9782112ab)
Andreas Gampe [Wed, 8 Jun 2016 06:16:46 +0000 (23:16 -0700)]
Installd: Fix bad merge
Don't cut off the leading dex location character.
Bug:
25612095
Change-Id: Iad556a0bb48c57f3c68ee75ee41f14e88d96b1a8
(cherry picked from commit
f065032f5331e1739fe32a2db9df8c91905720f9)
Andreas Gampe [Sat, 4 Jun 2016 04:13:50 +0000 (21:13 -0700)]
Installd: Change app image name computation
Refactor computation to take A/B OTAs into account.
Fix a const issue.
Bug:
25612095
Change-Id: I5cf79def532d1eeec4b35bb80014376959083a83
(cherry picked from commit
d01a02ce6980de0024333b4673cff9a77be629cf)
Andreas Gampe [Fri, 3 Jun 2016 23:09:32 +0000 (16:09 -0700)]
Installd: Refactor dexopt to scoped file descriptor
Refactor the goto-fail cleanup to a unique_fd-like wrapper that
includes a potential cleanup step. In preparation for changes for
A/B OTA.
Bug:
25612095
Change-Id: If6cca85c12e0951bc468cb4f212b2f2d288c6041
(cherry picked from commit
afa58d175cc3e9adaa4f8df9bc7a8fac5798a50a)
Andreas Gampe [Fri, 3 Jun 2016 17:22:19 +0000 (10:22 -0700)]
Installd: Remove string-helpers
Replace string-helpers with equivalent functions from android::base.
Bug:
25612095
Change-Id: I186461b94dffe3590c16455d4dee0c2cbe921bf4
(cherry picked from commit
4769ccafd6e6b94ab73afcb755fe59764c228eae)
Andreas Gampe [Fri, 3 Jun 2016 00:56:45 +0000 (17:56 -0700)]
Otapreopt: Fix after shared-library work
Commit
b63d91fd2737680351876406277b6c759f4db33c broke the installd
to otapreopt connection. Fix this. Also refactor a bit to make an
inadvertant break harder.
Bug:
25612095
Change-Id: I8e7b944ecbd5457e4ac4d6ffffdb0468618cf65f
(cherry picked from commit
aef445d1c659698612c0e5a8f3d5f2b9f8a2b778)
David Brazdil [Tue, 6 Sep 2016 14:35:28 +0000 (15:35 +0100)]
installd: Simplify Dalvik cache path creation
Installd computes Dalvik cache path for a dex file by concatenating
'/classes.dex' to the APKs absolute path and then replacing all '/'
characters with '@'. OTA preopt does the same, only in reverse order,
i.e by concatenating '@classes.dex' to altered absolute path.
This patch unifies the two approaches so as to keep only one string
constant.
Change-Id: I69bb6bca831f45c873a0eb8580cf8d4b011f3b09
Chih-hung Hsieh [Fri, 2 Sep 2016 16:18:32 +0000 (16:18 +0000)]
Merge "Fix google-explicit-constructor warnings in inputflinger."
am:
6fabbc60fc
Change-Id: Ie8d9d087ffdbf804228a3897c07b7ccc9c8b7d7a
Chih-hung Hsieh [Fri, 2 Sep 2016 16:11:33 +0000 (16:11 +0000)]
Merge "Fix google-explicit-constructor warnings in inputflinger."
Chih-hung Hsieh [Fri, 2 Sep 2016 02:33:43 +0000 (02:33 +0000)]
Merge "Fix google-explicit-constructor warnings in vulkan."
am:
476e517868
Change-Id: Ide2fd3dd74375a1a7cf32f899d7307b42f805567
Chih-hung Hsieh [Fri, 2 Sep 2016 02:25:41 +0000 (02:25 +0000)]
Merge "Fix google-explicit-constructor warnings in vulkan."
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:42:49 +0000 (11:42 -0700)]
Fix google-explicit-constructor warnings in dumpstate.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I61a0e9a8a38a09c1e33a479c3111c45c5fe7483d
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:37:47 +0000 (11:37 -0700)]
Fix google-explicit-constructor warnings in vulkan.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I13c32bd5bc53fe897df58eda331ff70ebcf0b349
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:34:16 +0000 (11:34 -0700)]
Fix google-explicit-constructor warnings in surfaceflinger.
* Add explicit keyword to conversion constructors,
or use NOLINT for implicit converters.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I94f511c3be31dc22022db6466ee9ed0c6be2bc8e
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:32:35 +0000 (11:32 -0700)]
Fix google-explicit-constructor warnings in sensorservice.
* Add explicit keyword to conversion constructors,
or use NOLINT for implicit converters.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: Ie7c4dfcdbd069809e103f0dd008ae2fb4b0502f4
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:28:23 +0000 (11:28 -0700)]
Fix google-explicit-constructor warnings in inputflinger.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I8259317db74b177b6e62a0aa2ad21aead47f698e
gaoshang [Wed, 24 Aug 2016 02:23:50 +0000 (10:23 +0800)]
redirect to call assignPointerIds if there is id < 0 case
Symptom: If assignPointerIds() is not called, the unknown value of
outPointer.id will lead to undefined things
Root Cause: mHavePointerIds be overwritten to true in last cycle
Solution: recover mHavePointerIds=false if any id < 0, to call assignPointerIds()
https://code.google.com/p/android/issues/detail?id=221273
Change-Id: I65ca0b82a6fceb495a0de17315b1f49cdab5fba0
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
Dan Willemsen [Mon, 29 Aug 2016 22:47:25 +0000 (22:47 +0000)]
Merge "Remove FRAMEBUFFER_FORCE_FORMAT"
am:
0322a7176f
Change-Id: I6cf454e05dc69f1420e4d23593f105005cf0abd5
Treehugger Robot [Mon, 29 Aug 2016 22:36:05 +0000 (22:36 +0000)]
Merge "Remove FRAMEBUFFER_FORCE_FORMAT"
Dan Willemsen [Mon, 1 Aug 2016 08:12:35 +0000 (01:12 -0700)]
Remove FRAMEBUFFER_FORCE_FORMAT
It's no longer used, except for a debugging line.
Change-Id: I44e1c17129e71168b263e872e9aaab0f164d3832
Martijn Coenen [Thu, 25 Aug 2016 20:18:09 +0000 (20:18 +0000)]
Merge changes from topic 'utf'
am:
213f015932
Change-Id: I12341504ac649cf8ea4558ed2ae882e3dcdce7fd
Martijn Coenen [Thu, 25 Aug 2016 20:08:14 +0000 (20:08 +0000)]
Merge changes from topic 'utf'
* changes:
Add bound checks to utf16_to_utf8
Unicode: specify destination length in utf8_to_utf16 methods
Mark Salyzyn [Thu, 25 Aug 2016 19:23:02 +0000 (19:23 +0000)]
Merge "binder: use ashmem_valid()"
am:
b5ac868729
Change-Id: I51b117612d0db48534bb4e4ecf9307b810088ece
Treehugger Robot [Thu, 25 Aug 2016 19:14:49 +0000 (19:14 +0000)]
Merge "binder: use ashmem_valid()"
Hans Boehm [Thu, 25 Aug 2016 18:45:59 +0000 (18:45 +0000)]
Merge "Fix memory ordering issues; document IMemory peculiarities"
am:
2347fca424
Change-Id: Icfd7db17ff04ed52b8d669d39a28b42fc0655329
Hans Boehm [Thu, 25 Aug 2016 18:39:01 +0000 (18:39 +0000)]
Merge "Fix memory ordering issues; document IMemory peculiarities"
Mark Salyzyn [Tue, 23 Aug 2016 23:15:04 +0000 (16:15 -0700)]
binder: use ashmem_valid()
Bug:
30310689
Change-Id: I38e2720843f1eebec39ce6c7d957ee9a1dafac59
Sergio Giro [Tue, 28 Jun 2016 17:19:33 +0000 (18:19 +0100)]
Add bound checks to utf16_to_utf8
Bug:
29250543
Change-Id: I518e7b2fe10aaa3f1c1987586a09b1110aff7e1a
(cherry picked from commit
7e93b2ddcb49b5365fbe1dab134ffb38e6f1c719)
Sergio Giro [Thu, 21 Jul 2016 13:46:35 +0000 (14:46 +0100)]
Unicode: specify destination length in utf8_to_utf16 methods
Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
Hans Boehm [Wed, 13 Jul 2016 01:05:49 +0000 (18:05 -0700)]
Fix memory ordering issues; document IMemory peculiarities
Convert to standard atomics.
Correct mHeapId memory ordering. Required acquire ordering on loads
was missing in several places.
Remove atomic updates to count, since it is only updated with lock
held. (And would be missing fences if this were not true.)
Document the peculiar use of copy-in-write vectors in a context in
which copy-on-write is unsafe.
While we're here, consistently check dup() for errors.
Bug:
28816986
Merged-in: I05b9f96e3867fa2e0abe6f319be8c56b89624c41
Change-Id: I05b9f96e3867fa2e0abe6f319be8c56b89624c41
Christopher Wiley [Fri, 19 Aug 2016 23:25:59 +0000 (23:25 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths"
am:
b77d368d89
Change-Id: Ibc4639f6b1a4067b4c30ca294beb9e747736d3f8
Treehugger Robot [Fri, 19 Aug 2016 23:14:50 +0000 (23:14 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths"
Christopher Wiley [Fri, 19 Aug 2016 18:43:54 +0000 (11:43 -0700)]
libbinder: Support reading/writing out T[] lengths
T[] types are special: the length of the out array is written
into the inbound parcel to signal the expected length to the
server.
Bug:
30836680
Change-Id: I4f2f39fd7b1a6b94a25bd7f6c3baed430fd567bc
Test: integration tests pass with this change.
Dmitriy Filchenko [Thu, 18 Aug 2016 03:17:36 +0000 (03:17 +0000)]
Merge "Remove unused include."
am:
5242fb42fb
Change-Id: Id3ccb5f3dfb9d2188b6e570eaaa6ba23438ae392
Treehugger Robot [Thu, 18 Aug 2016 03:13:47 +0000 (03:13 +0000)]
Merge "Remove unused include."
Dmitriy Filchenko [Thu, 18 Aug 2016 01:00:39 +0000 (18:00 -0700)]
Remove unused include.
BUG:
29824203
Change-Id: Ied8ccb8c30632b41f6c6c3d848dc94d7b1e731e0
Dan Willemsen [Fri, 5 Aug 2016 21:06:41 +0000 (14:06 -0700)]
resolve merge conflicts of
0783d5f to stage-aosp-master
Change-Id: I4fe9c0391d6d41bae5fbbb0df6e00e264e87649f
Dan Willemsen [Fri, 5 Aug 2016 20:44:52 +0000 (20:44 +0000)]
Merge "Start converting Android.mk to Android.bp"
Dan Willemsen [Tue, 26 Jul 2016 00:13:45 +0000 (17:13 -0700)]
Start converting Android.mk to Android.bp
See build/soong/README.md for more information.
Merged-In: Ifbe9b0072a63b4467c72b3a52148a606e5365f78
Change-Id: Ifbe9b0072a63b4467c72b3a52148a606e5365f78
Dimitry Ivanov [Mon, 1 Aug 2016 22:47:36 +0000 (22:47 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
am:
1c59b4b4e8
Change-Id: Ib0b9789d7a75928f7433557936b9fac81c53b049
Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"