OSDN Git Service
Alex Vakulenko [Thu, 20 Apr 2017 15:53:36 +0000 (15:53 +0000)]
Merge "libpdx_uds: Serialize access to connection socket between threads" into oc-dev am:
84a0b9238a
am:
201733b044
Change-Id: Ie3efc4eef8e79c82ffef9f6a95d926280237b6e9
Yifan Hong [Thu, 20 Apr 2017 15:53:21 +0000 (15:53 +0000)]
Merge "Fix reference loop in IEventQueue implementation." into oc-dev am:
e382c18831
am:
21d721516a
Change-Id: I5239a8efff5090ad7ecfb56c1920d5b5c31842d1
Alex Vakulenko [Thu, 20 Apr 2017 15:53:05 +0000 (15:53 +0000)]
Merge "libpdx_uds: Allow to create Endpoint/ClientChannel from a socket pair" into oc-dev am:
f5524db232
am:
05109d7293
Change-Id: I99801e1bf0ed727b6a0ef909ef912103c14293f3
Peng Xu [Thu, 20 Apr 2017 15:52:49 +0000 (15:52 +0000)]
Merge "Calculate batching param in a smarter way" into oc-dev am:
20c35e424e
am:
69f12c3cfd
Change-Id: I9705f13160835f81ba4fc5897d43bfe99cefa1a5
Hendrik Wagenaar [Thu, 20 Apr 2017 15:52:31 +0000 (15:52 +0000)]
Merge "Fix default optics" into oc-dev am:
87c83b1de4
am:
ab329bfcfb
Change-Id: I7d682ceb34c21d37728c650a98c7e826658e4a60
Hendrik Wagenaar [Thu, 20 Apr 2017 15:52:14 +0000 (15:52 +0000)]
Merge "Remove the lookup distortion class" into oc-dev am:
78145dd40d
am:
d32c27c2e9
Change-Id: I55db223078a9a25e90de5e10af1199c2ad56dd7f
Yifan Hong [Thu, 20 Apr 2017 15:51:43 +0000 (15:51 +0000)]
Merge "Fix lshal not to squash HAL entries incorrectly." am:
665173c59d am:
167edf54a0 am:
09ccaa169e
am:
e776177295
Change-Id: Iabc3f1e6808a7c6a491da7b9da3888548dba69a9
Andreas Gampe [Thu, 20 Apr 2017 15:51:23 +0000 (15:51 +0000)]
Merge "Otapreopt: Fix count" into oc-dev am:
e620d805d8
am:
68e58c45a8
Change-Id: Ib51503fc8778f1b0b3858d9b92cfb3dfb869c040
Dan Cashman [Thu, 20 Apr 2017 15:25:48 +0000 (15:25 +0000)]
Merge "Reflect removal of vndservice_manager SELinux object manager." into oc-dev am:
fbc73bf092
am:
e313f5a6c6
Change-Id: I830e3afbcd28eeb8e5a8ad5125f04b8b281db333
Alex Vakulenko [Thu, 20 Apr 2017 04:15:31 +0000 (04:15 +0000)]
Merge "libpdx_uds: Serialize access to connection socket between threads" into oc-dev
am:
84a0b9238a
Change-Id: I9767b882688a200443976ff311b21b9a27dec279
Yifan Hong [Thu, 20 Apr 2017 04:13:38 +0000 (04:13 +0000)]
Merge "Fix reference loop in IEventQueue implementation." into oc-dev
am:
e382c18831
Change-Id: Ie1c1a2d6b1820ce1a21d96ba523d904e635522ae
TreeHugger Robot [Thu, 20 Apr 2017 04:11:17 +0000 (04:11 +0000)]
Merge "libpdx_uds: Serialize access to connection socket between threads" into oc-dev
Alex Vakulenko [Thu, 20 Apr 2017 04:08:30 +0000 (04:08 +0000)]
Merge "libpdx_uds: Allow to create Endpoint/ClientChannel from a socket pair" into oc-dev
am:
f5524db232
Change-Id: I4d83b19a7998bf0ce76c7d0e7a6d678fc772be4e
TreeHugger Robot [Thu, 20 Apr 2017 04:08:29 +0000 (04:08 +0000)]
Merge "Fix reference loop in IEventQueue implementation." into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 03:57:16 +0000 (03:57 +0000)]
Merge "libpdx_uds: Allow to create Endpoint/ClientChannel from a socket pair" into oc-dev
Colin Cross [Thu, 20 Apr 2017 03:16:16 +0000 (03:16 +0000)]
Merge "Convert inputflinger to Android.bp"
Peng Xu [Thu, 20 Apr 2017 02:12:04 +0000 (02:12 +0000)]
Merge "Calculate batching param in a smarter way" into oc-dev
am:
20c35e424e
Change-Id: I941b3af48cf7437d71079386ea6e7fc14a05df57
Peng Xu [Thu, 20 Apr 2017 02:01:37 +0000 (02:01 +0000)]
Merge "Calculate batching param in a smarter way" into oc-dev
Yifan Hong [Thu, 20 Apr 2017 01:45:30 +0000 (18:45 -0700)]
Fix reference loop in IEventQueue implementation.
EventQueue's destructor is never called because
EventQueueLooperCallback has a strong reference to it,
and EventQueueLooperCallback is never destroyed because
the file descriptor is never removed from the looper.
Bug:
37280081
Test: camera works
Test: event queue is destroyed when client removes
its reference (from logcat)
Change-Id: I12347b6d1cca354288382555d2d9a20acfa59233
Hendrik Wagenaar [Thu, 20 Apr 2017 01:23:56 +0000 (01:23 +0000)]
Merge "Fix default optics" into oc-dev
am:
87c83b1de4
Change-Id: I313cd0190cf3c38bfce6b94f3ee86824220f6770
Hendrik Wagenaar [Thu, 20 Apr 2017 01:23:41 +0000 (01:23 +0000)]
Merge "Remove the lookup distortion class" into oc-dev
am:
78145dd40d
Change-Id: I358b9f7960cb4df5854b2d9c04eb6b7748a5d751
TreeHugger Robot [Thu, 20 Apr 2017 01:20:01 +0000 (01:20 +0000)]
Merge "Fix default optics" into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 01:19:47 +0000 (01:19 +0000)]
Merge "Remove the lookup distortion class" into oc-dev
Yifan Hong [Thu, 20 Apr 2017 01:03:30 +0000 (01:03 +0000)]
Merge "Fix lshal not to squash HAL entries incorrectly." am:
665173c59d am:
167edf54a0
am:
09ccaa169e
Change-Id: I1867070622cf8799859db748e6ca8bb6aadf7ed3
Yifan Hong [Thu, 20 Apr 2017 01:01:25 +0000 (01:01 +0000)]
Merge "Fix lshal not to squash HAL entries incorrectly." am:
665173c59d
am:
167edf54a0
Change-Id: I6a0f3b69ff758598982971825747a19588e6063a
Yifan Hong [Thu, 20 Apr 2017 00:59:25 +0000 (00:59 +0000)]
Merge "Fix lshal not to squash HAL entries incorrectly."
am:
665173c59d
Change-Id: I2e64c731627f971ee28f8e2c95d98a5e5717d841
Yifan Hong [Thu, 20 Apr 2017 00:51:48 +0000 (00:51 +0000)]
Merge "Fix lshal not to squash HAL entries incorrectly."
John Bates [Thu, 20 Apr 2017 00:49:09 +0000 (00:49 +0000)]
Merge "Hold onto FileHandles for glBindSharedBufferQCOM calls" into oc-dev am:
e602082190
am:
ec599a47ba
Change-Id: I573bb68564b6078f50dd7cae741ca6e1caddd525
Andreas Gampe [Thu, 20 Apr 2017 00:47:04 +0000 (00:47 +0000)]
Merge "Otapreopt: Fix count" into oc-dev
am:
e620d805d8
Change-Id: Ifc134fd806137d09ed7ac914ea37769e0c1d92ad
Colin Cross [Wed, 19 Apr 2017 23:56:46 +0000 (16:56 -0700)]
Convert inputflinger to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Iebdc3f4d2d560b0fdf5447dde0ac06df64826bb5
TreeHugger Robot [Thu, 20 Apr 2017 00:34:55 +0000 (00:34 +0000)]
Merge "Otapreopt: Fix count" into oc-dev
Dan Cashman [Thu, 20 Apr 2017 00:19:28 +0000 (00:19 +0000)]
Merge "Reflect removal of vndservice_manager SELinux object manager." into oc-dev
am:
fbc73bf092
Change-Id: Id4517f15bb8e95e19c975eccc6a57dc95c9a8535
TreeHugger Robot [Thu, 20 Apr 2017 00:06:41 +0000 (00:06 +0000)]
Merge "Reflect removal of vndservice_manager SELinux object manager." into oc-dev
John Bates [Wed, 19 Apr 2017 23:48:20 +0000 (23:48 +0000)]
Merge "Hold onto FileHandles for glBindSharedBufferQCOM calls" into oc-dev
am:
e602082190
Change-Id: I5aa7ce944677838fbf86d0e1d59e4a0f9122e0a9
TreeHugger Robot [Wed, 19 Apr 2017 23:34:48 +0000 (23:34 +0000)]
Merge "Convert libreplayer to blueprint"
Hendrik Wagenaar [Tue, 18 Apr 2017 22:12:30 +0000 (15:12 -0700)]
Fix default optics
* Prior cl caused an infinite loop with the defaults
* Removed linear approximation - it caused issues with
inverse distortion
Bug:
37443861
Test: Manually ran on a few phones
Test: Wrote a program that compared the distortion and
undistortion values with the old and new path
Change-Id: I7221679585dd7f0fe966ff11170e9d3ec74a51df
TreeHugger Robot [Wed, 19 Apr 2017 23:11:12 +0000 (23:11 +0000)]
Merge "Hold onto FileHandles for glBindSharedBufferQCOM calls" into oc-dev
Alex Vakulenko [Wed, 19 Apr 2017 22:51:50 +0000 (22:51 +0000)]
Merge changes If30bfa71,Ib8f78967 into oc-dev am:
1fbefc70df
am:
ad1c74c012
Change-Id: Ica0f63301759d1454fe7d665aaa5ae587cd13782
Zheng Zhang [Wed, 19 Apr 2017 22:51:29 +0000 (22:51 +0000)]
DO NOT MERGE: SF: disable HW vsync while dozing am:
46d455b3ab am:
eee8fc1cd2 -s ours am:
ddd347c298
am:
c0fe86ff01
Change-Id: I0c6ee0b14de19af8db42b7e5276250364af5a90c
Zheng Zhang [Wed, 19 Apr 2017 22:51:09 +0000 (22:51 +0000)]
DO NOT MERGE: SF: disable HW vsync while dozing am:
46d455b3ab am:
eee8fc1cd2 am:
bf2ae10cce -s ours
am:
2a9023b0f6
Change-Id: I97fb34da3ede919f3bc5e7dc221b16791c6e362c
Jeff Hao [Wed, 19 Apr 2017 22:50:47 +0000 (22:50 +0000)]
Merge "Fix passing --classpath-dir to dex2oat for split apks." am:
24ff69485e am:
7ad28fadc3 am:
08a3d08fee
am:
2e480e6991
Change-Id: Id9e369d5bf217f563c7e9910d4fcc6d0f31c7bc1
Alex Vakulenko [Wed, 19 Apr 2017 22:35:40 +0000 (22:35 +0000)]
Merge changes If30bfa71,Ib8f78967 into oc-dev
am:
1fbefc70df
Change-Id: I077a810a54c33ca97c18912ca6399bcb3552824c
Zheng Zhang [Wed, 19 Apr 2017 22:35:24 +0000 (22:35 +0000)]
DO NOT MERGE: SF: disable HW vsync while dozing am:
46d455b3ab am:
eee8fc1cd2 -s ours
am:
ddd347c298
Change-Id: I05f442bcd1d03b1adde9fc3ec78d5ed566c45d9b
TreeHugger Robot [Wed, 19 Apr 2017 22:34:25 +0000 (22:34 +0000)]
Merge changes If30bfa71,Ib8f78967 into oc-dev
* changes:
pdx_benchmarks: Let the service create sockets by itself
libpdx_uds: Fix send/receive over socket to handle signal interrupts
Zheng Zhang [Wed, 19 Apr 2017 22:34:08 +0000 (22:34 +0000)]
DO NOT MERGE: SF: disable HW vsync while dozing am:
46d455b3ab am:
eee8fc1cd2
am:
bf2ae10cce -s ours
Change-Id: Ia369c6436029f65fe46a379f400692751314faf5
Zheng Zhang [Wed, 19 Apr 2017 22:31:55 +0000 (22:31 +0000)]
DO NOT MERGE: SF: disable HW vsync while dozing am:
46d455b3ab
am:
eee8fc1cd2
Change-Id: I35d9ddfd59394b85428faeadd33713c742edc273
Zheng Zhang [Wed, 19 Apr 2017 22:31:37 +0000 (22:31 +0000)]
DO NOT MERGE: SF: disable HW vsync while dozing am:
46d455b3ab
am:
eee8fc1cd2 -s ours
Change-Id: I27ca7dfc0618b18865379441f0ab32d06477d220
Jeff Hao [Wed, 19 Apr 2017 22:29:10 +0000 (22:29 +0000)]
Merge "Fix passing --classpath-dir to dex2oat for split apks." am:
24ff69485e am:
7ad28fadc3
am:
08a3d08fee
Change-Id: I33b93e916c11b117101594d4dfde90b1e3de3e53
Zheng Zhang [Wed, 19 Apr 2017 22:29:07 +0000 (22:29 +0000)]
DO NOT MERGE: SF: disable HW vsync while dozing
am:
46d455b3ab
Change-Id: I8e2eb78fc79b5127d9baa6079095115c431e1823
Jeff Hao [Wed, 19 Apr 2017 22:27:38 +0000 (22:27 +0000)]
Merge "Fix passing --classpath-dir to dex2oat for split apks." am:
24ff69485e
am:
7ad28fadc3
Change-Id: I8aaad725f691d3e3cc4e3262853365c360d1d95a
Jeff Hao [Wed, 19 Apr 2017 22:25:39 +0000 (22:25 +0000)]
Merge "Fix passing --classpath-dir to dex2oat for split apks."
am:
24ff69485e
Change-Id: If467da70c5637b9025435ebf7e6900349564f815
Treehugger Robot [Wed, 19 Apr 2017 22:22:32 +0000 (22:22 +0000)]
Merge "Fix passing --classpath-dir to dex2oat for split apks."
TreeHugger Robot [Wed, 19 Apr 2017 22:22:22 +0000 (22:22 +0000)]
Merge "Reflect removal of vndservice_manager SELinux object manager."
Andreas Gampe [Wed, 19 Apr 2017 21:59:38 +0000 (21:59 +0000)]
Merge "Otapreopt: Add non-profile fallback" into oc-dev am:
c211793ac6
am:
533a393631
Change-Id: I5d9684ac6f9f82e851302732590f5f39dd82c0e0
Andreas Gampe [Wed, 19 Apr 2017 21:52:18 +0000 (21:52 +0000)]
Merge "Otapreopt: Add non-profile fallback" into oc-dev
am:
c211793ac6
Change-Id: Ia5382234efcb715e7c58fac62eb1400055a41f04
Fabien Sanglard [Wed, 5 Apr 2017 21:24:41 +0000 (14:24 -0700)]
Convert libreplayer to blueprint
Bug:
34095715
Test: Manual and AUPT
Change-Id: Iad825598fa4035508789c895fc90da52b86e39fb
Jeff Hao [Wed, 19 Apr 2017 21:22:07 +0000 (21:22 +0000)]
resolve merge conflicts of
d3b56698c to oc-dev-plus-aosp
am:
99d7da9903
Change-Id: If25813b0772a90a31a072b02839017e5efac7cbe
Andreas Gampe [Wed, 19 Apr 2017 20:58:49 +0000 (13:58 -0700)]
Otapreopt: Fix count
Don't count null for argc.
Bug:
37158297
Test: m
Test: OTA pre-versioned -> OTA versioned
Change-Id: I378b0b7b445f34c766460182d724d6abd84ff773
Jeff Hao [Wed, 19 Apr 2017 20:50:15 +0000 (13:50 -0700)]
Fix passing --classpath-dir to dex2oat for split apks.
Merged wrong version of CL in by mistake. CL should have been
cherry-picked from
cc5c4e32637601432bc6359fb7ff34e4cadb6502.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
Change-Id: Ibebcdce1c9ab0de3254727c8dfc3d0de18932f1c
Jeff Hao [Wed, 19 Apr 2017 20:37:47 +0000 (13:37 -0700)]
resolve merge conflicts of
d3b56698c to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iae7fc90e9281102fb32dcc214838f590b9576f7a
TreeHugger Robot [Wed, 19 Apr 2017 20:31:59 +0000 (20:31 +0000)]
Merge "Otapreopt: Add non-profile fallback" into oc-dev
Jeff Hao [Wed, 19 Apr 2017 20:16:18 +0000 (20:16 +0000)]
Merge "Run dex2oat from the staged apk directory." into oc-dev
Hendrik Wagenaar [Wed, 19 Apr 2017 20:06:53 +0000 (20:06 +0000)]
Merge "DVRBuffer functions should acquire AHardwareBuffer" into oc-dev am:
b132557432
am:
b87f3e859d
Change-Id: I7688abb72bd4e986c7afe48116376d0ee135313d
Hendrik Wagenaar [Wed, 19 Apr 2017 19:59:37 +0000 (19:59 +0000)]
Merge "DVRBuffer functions should acquire AHardwareBuffer" into oc-dev
am:
b132557432
Change-Id: I579c54fbd02aa39d5a92d9a827a18a615d75edea
TreeHugger Robot [Wed, 19 Apr 2017 19:51:37 +0000 (19:51 +0000)]
Merge "DVRBuffer functions should acquire AHardwareBuffer" into oc-dev
Alex Vakulenko [Tue, 18 Apr 2017 21:41:33 +0000 (14:41 -0700)]
libpdx_uds: Serialize access to connection socket between threads
Added a mutex to allow only one client thread to perform atomic
send-request/receive-responce actions.
Also added a unit test that perfroms multiple parallel client requests
to the same service to ensure it can handle multithreaded access
correctly.
Bug:
37443070
Test: `libpdx_uds_tests` pass
Change-Id: Ica516f7806f9146fb530b5cb371d2ee89146fed7
Alex Vakulenko [Tue, 18 Apr 2017 21:37:20 +0000 (14:37 -0700)]
libpdx_uds: Allow to create Endpoint/ClientChannel from a socket pair
This is important to enable Service/Client operation in unit tests.
Being able to create a pair of Unix domain sockets and construct both
Service and Client so that they can talk to each other without having
to create a physical socket file is convenient.
This change makes it possible to create an instance of Endpoint and
ClientChannel classes based just on a pair of sockets (Endpoint does
take another socket to simulate the main endpoint FD to accept incoming
connection on, but it is not used for this, only the shutdown events
are received from that main socket. Endpoint uses the channel FD to
perform actual communication with the client).
Bug:
37443070
Test: `libpdx_uds_tests` pass
Change-Id: Ifa1a9d03b97bd90282a04715c2105ad37a8de936
Alex Vakulenko [Mon, 17 Apr 2017 23:19:51 +0000 (16:19 -0700)]
pdx_benchmarks: Let the service create sockets by itself
Default implementation of Endpoint::Create() takes the socket name
as provided by the init process when it forks. pdx_benchmark is not
a service but a command-line utility and it is being started manually
and not through init process. So, named sockets are not available.
Instead, it must create a socket by the specified name. For this,
it must use Endpoint::CreateAndBindSocket() method.
Bug:
37507039
Test: Tested manually on device: `pdx_benchmarks --service foo`.
Change-Id: If30bfa7138f5a97ba0bff9e61460c6bd3697ec19
Wonsik Kim [Wed, 19 Apr 2017 19:16:28 +0000 (19:16 +0000)]
Merge "Return error when trying to disconnect twice" into oc-dev am:
fc333972e9
am:
cc92455154
Change-Id: I058196f0eab14cd9ff98508eb230d9d6de90f0a1
Wonsik Kim [Wed, 19 Apr 2017 19:07:39 +0000 (19:07 +0000)]
Merge "Return error when trying to disconnect twice" into oc-dev
am:
fc333972e9
Change-Id: Ief6294b415385e1cf584f1d54cf605c78717c43d
TreeHugger Robot [Wed, 19 Apr 2017 18:47:44 +0000 (18:47 +0000)]
Merge "Return error when trying to disconnect twice" into oc-dev
Jeff Hao [Thu, 6 Apr 2017 00:11:39 +0000 (17:11 -0700)]
Run dex2oat from the staged apk directory.
The frameworks/base change makes the PackageManager pass relative paths
of previous code paths as shared library paths. This change passes the
base directory for these relative paths to dex2oat using the new switch
--classpath-dir.
Part of a multi-project change.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
(cherry-picked from commit
cc5c4e32637601432bc6359fb7ff34e4cadb6502)
Change-Id: I8f941eb9982a051c1f49256d5489f2575af1d80f
Jeff Hao [Wed, 19 Apr 2017 17:58:55 +0000 (17:58 +0000)]
Merge "Run dex2oat from the staged apk directory." am:
296d91edc8 am:
7b30832493 am:
27167f9cd0
am:
bba4b8a1fd -s ours
Change-Id: I3941cf4218c4d617b856cc4de25e32b20f8566cc
Jeff Hao [Wed, 19 Apr 2017 17:51:06 +0000 (17:51 +0000)]
Merge "Run dex2oat from the staged apk directory." am:
296d91edc8 am:
7b30832493
am:
27167f9cd0
Change-Id: I3fe2a1e60a8fd3a8e6726940249e523837ddb733
Jeff Hao [Wed, 19 Apr 2017 17:30:18 +0000 (17:30 +0000)]
Merge "Run dex2oat from the staged apk directory." am:
296d91edc8
am:
7b30832493
Change-Id: Ica5c4f3bbfb1f99fd21251917f223b6e04658ffc
Jeff Hao [Wed, 19 Apr 2017 17:21:47 +0000 (17:21 +0000)]
Merge "Run dex2oat from the staged apk directory."
am:
296d91edc8
Change-Id: Ib3ddad33a505a74e6004123d08e64a177c7045aa
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Run dex2oat from the staged apk directory."
Alex Vakulenko [Mon, 17 Apr 2017 19:02:38 +0000 (12:02 -0700)]
libpdx_uds: Fix send/receive over socket to handle signal interrupts
Previous implementation of send/receive didn't account for the fact that
send/receive operation might be interrupted by a signal and transfer
fewer bytes than requested.
Fix this by repeatedly calling send/recv until all the requested data
is transferred over sockets.
Also added a number of unit tests for send/receive functions.
Bug:
37427314
Test: `m -j32` succeeds for Sailfish.
`libpdx_uds_tests` pass on device
Change-Id: Ib8f78967af3c218d9f18fb3dfe8953c35800540b
Dan Cashman [Tue, 18 Apr 2017 18:17:49 +0000 (11:17 -0700)]
Reflect removal of vndservice_manager SELinux object manager.
(preemptive cherry-pick of commit:
2762a7833ffc68cb731be53730e2364920a9d041
to avoid merge conflict)
Bug:
34454312
Bug:
36052864
Test: policy builds and device boots.
Change-Id: Ic2aebb15f4ae9085bf2cb440cceef6b4beb5ddc5
Chia-I Wu [Wed, 19 Apr 2017 16:23:41 +0000 (16:23 +0000)]
Merge "libui: remove gralloc0/gralloc1 support" into oc-dev am:
5330710aeb
am:
5a9ee7e1ba
Change-Id: I4c080dbd5d8096844535702db8c4a456d0086f66
Andreas Gampe [Tue, 18 Apr 2017 03:04:02 +0000 (20:04 -0700)]
Otapreopt: Add non-profile fallback
Slightly refactor compilation flow. Add a fallback option: if the
compilation fails and was profile-guided, attempt a non-profile-
guided compilation. This makes A/B OTA more robust to profile
format changes.
Bug:
37256688
Test: m
Test: manual OTA N -> O
Change-Id: I20c4b44a87c0f7faa8920abdae01e39379405eca
Chia-I Wu [Wed, 19 Apr 2017 16:21:42 +0000 (16:21 +0000)]
Merge "libui: remove gralloc0/gralloc1 support" into oc-dev
am:
5330710aeb
Change-Id: I41ca51009ee0c79ea5cead75d9da29707c17abc4
Chia-I Wu [Wed, 19 Apr 2017 16:16:21 +0000 (16:16 +0000)]
Merge "libui: remove gralloc0/gralloc1 support" into oc-dev
Hendrik Wagenaar [Wed, 19 Apr 2017 05:03:09 +0000 (22:03 -0700)]
DVRBuffer functions should acquire AHardwareBuffer
Bug:
37488135
Test: Updated DVR buffer tests
Change-Id: Ia255aca571e7162382e7be3c13be8ea192adbc90
Hendrik Wagenaar [Wed, 19 Apr 2017 03:45:10 +0000 (20:45 -0700)]
Remove the lookup distortion class
* This class is no longer used.
Test: Compiled locally
Bug:
37487610
Change-Id: Ie0bd1441e04086990309d5eb4ca3b4f64351ae05
Yifan Hong [Tue, 18 Apr 2017 21:19:40 +0000 (14:19 -0700)]
Fix lshal not to squash HAL entries incorrectly.
Bug:
37311367
Test: lshal --init-vintf
Change-Id: I693b53f5f342c7600e4031d020792fd347e3ae83
Jeff Hao [Thu, 6 Apr 2017 00:11:39 +0000 (17:11 -0700)]
Run dex2oat from the staged apk directory.
The frameworks/base change makes the PackageManager pass relative paths
of previous code paths as shared library paths. This change passes the
base directory for these relative paths to dex2oat using the new switch
--base-dir.
Part of a multi-project change.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
Merged-In: Ic20aa0b6a80104d0759ac84df3eb89570604e53f
(cherry-picked from commit
cc5c4e32637601432bc6359fb7ff34e4cadb6502)
Change-Id: I29e6e7365654cc1a538272591356e2253d6ec0e4
TreeHugger Robot [Wed, 19 Apr 2017 01:23:13 +0000 (01:23 +0000)]
Merge "SF: disable HW vsync while dozing"
Carmen Jackson [Wed, 19 Apr 2017 01:14:21 +0000 (01:14 +0000)]
Merge "atrace: Don't NPE if we can't access hal-related tracepoint files." into oc-dev am:
638fc1f809
am:
c35a2c6514
Change-Id: I3f97bed1c56b8ed47fe93489aea575a018494795
Carmen Jackson [Wed, 19 Apr 2017 01:10:50 +0000 (01:10 +0000)]
Merge "atrace: Don't NPE if we can't access hal-related tracepoint files." into oc-dev
am:
638fc1f809
Change-Id: I5c6fa1f459c84c45d00f1047aee09fdf921cf345
TreeHugger Robot [Wed, 19 Apr 2017 01:06:26 +0000 (01:06 +0000)]
Merge "atrace: Don't NPE if we can't access hal-related tracepoint files." into oc-dev
Jeff Hao [Tue, 18 Apr 2017 23:58:58 +0000 (23:58 +0000)]
Merge "Run dex2oat from the staged apk directory."
Carmen Jackson [Tue, 18 Apr 2017 23:53:24 +0000 (23:53 +0000)]
Merge "Add atrace_userdebug.rc to enable some tracepoints for userdebug only." into oc-dev am:
932dc64614
am:
c65c9d0aff
Change-Id: I6e850d894254ad4adebcd06e2c6ca86bd6ada95e
Carmen Jackson [Tue, 18 Apr 2017 23:47:54 +0000 (23:47 +0000)]
Merge "Add atrace_userdebug.rc to enable some tracepoints for userdebug only." into oc-dev
am:
932dc64614
Change-Id: I944f3c8c0b1a1f4c191cf616ddff22f67d4f2b14
Carmen Jackson [Tue, 18 Apr 2017 23:37:48 +0000 (23:37 +0000)]
Merge "Add atrace_userdebug.rc to enable some tracepoints for userdebug only." into oc-dev
Zheng Zhang [Fri, 17 Mar 2017 10:19:39 +0000 (11:19 +0100)]
SF: disable HW vsync while dozing
It cancels any in-progress resync when display goes to sleep, then
it avoids any unexpected wake up due to delayed frames once device
has just switched to ambient mode.
In DOZE_SUSPEND, screen displays a still image in a self-refresh mode,
so there is no need to keep aligned with HW vsync. At the opposite, DOZE
mode is used to refresh the screen in Ambient (i.e. watchface refresh,
nofications, app updates in ambi-active), hence resync SF to HW vsync.
Bug:
35998607
Bug:
36215242
Change-Id: I22cd8f84e9aca04b4f657fe07785751cf31a7c68
Zheng Zhang [Fri, 17 Mar 2017 10:19:39 +0000 (11:19 +0100)]
DO NOT MERGE: SF: disable HW vsync while dozing
It cancels any in-progress resync when display goes to sleep, then
it avoids any unexpected wake up due to delayed frames once device
has just switched to ambient mode.
In DOZE_SUSPEND, screen displays a still image in a self-refresh mode,
so there is no need to keep aligned with HW vsync. At the opposite, DOZE
mode is used to refresh the screen in Ambient (i.e. watchface refresh,
nofications, app updates in ambi-active), hence resync SF to HW vsync.
Bug:
35998607
Bug:
36215242
Change-Id: I22cd8f84e9aca04b4f657fe07785751cf31a7c68
Carmen Jackson [Tue, 18 Apr 2017 22:37:57 +0000 (15:37 -0700)]
atrace: Don't NPE if we can't access hal-related tracepoint files.
This currently NPEs when Traceur attempts to start a trace.
Based on b/
34242478, this is currently expected and we should fail
gracefully instead.
Bug:
37281960
Test: Starting a trace using Traceur on a userdebug build succeeds.
Change-Id: I082d5750625dec0e1db4a1dd341dc332d8dd752f
Steven Thomas [Tue, 18 Apr 2017 22:51:13 +0000 (22:51 +0000)]
Merge "Fix query management in GpuProfiler" into oc-dev am:
511544f212
am:
e5e680bd78
Change-Id: I1e45492386313e24778936e79b743d709c20a239
John Bates [Tue, 18 Apr 2017 22:50:59 +0000 (22:50 +0000)]
Merge "[vr] Add DVR API to get native handle for buffers" into oc-dev am:
1ab06328bb
am:
873ad17bba
Change-Id: I35eb99b8c6015f252b6e461e41926706a4688a2c
OSDN Git Service
