OSDN Git Service
Steven Moreland [Fri, 21 Apr 2017 20:08:34 +0000 (13:08 -0700)]
sensorservice: Android.bp -> Android.mk
Test: links
Change-Id: Ibe409076b4cdbf45d8477b466dbb9442362863c7
Okan Arikan [Fri, 21 Apr 2017 08:18:57 +0000 (08:18 +0000)]
Merge "Pose flicker fix on some devices" into oc-dev am:
5da2188e4c
am:
1c8b3073f6
Change-Id: Ice8603e580a34d3d99ee404c9aabbe2fb1ad0960
Okan Arikan [Fri, 21 Apr 2017 08:16:29 +0000 (08:16 +0000)]
Merge "Pose flicker fix on some devices" into oc-dev
am:
5da2188e4c
Change-Id: I1e38b1030b486c1f8f641415d343bddb560d746d
TreeHugger Robot [Fri, 21 Apr 2017 08:09:37 +0000 (08:09 +0000)]
Merge "Pose flicker fix on some devices" into oc-dev
Steven Moreland [Fri, 21 Apr 2017 02:11:38 +0000 (02:11 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp"" am:
c6a6fd0516 am:
4fe57dd57d am:
e9c068b263 -s ours
am:
5f123b446a -s ours
Change-Id: Iad89e5dc648d5154d577173a9faf0667a7d6e590
Steven Moreland [Fri, 21 Apr 2017 02:06:35 +0000 (02:06 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp"" am:
c6a6fd0516 am:
4fe57dd57d
am:
e9c068b263 -s ours
Change-Id: I99468607352a9102923cef48b475860a602942f2
Steven Moreland [Fri, 21 Apr 2017 02:05:17 +0000 (02:05 +0000)]
Revert "resolve merge conflicts of
03e80b462 to oc-dev-plus-aosp"
am:
5232d6d927
Change-Id: Idfa48f492017e11edc79c110cd99eb12ec527025
Steven Moreland [Fri, 21 Apr 2017 02:03:35 +0000 (02:03 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp"" am:
c6a6fd0516
am:
4fe57dd57d
Change-Id: Ie46dfeb8c57c4edeedbf474a7f5cb414e3ab686e
Steven Moreland [Fri, 21 Apr 2017 02:01:04 +0000 (02:01 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""
am:
c6a6fd0516
Change-Id: Ic5c3654b19f84b12add62a2ec127fb9eda7654a4
Steven Moreland [Fri, 21 Apr 2017 01:57:34 +0000 (01:57 +0000)]
Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""
Steven Moreland [Fri, 21 Apr 2017 01:57:19 +0000 (01:57 +0000)]
Revert "(lib)?sensorservice: Android.mk -> Android.bp"
This reverts commit
f1b07d51ed6a11a0446115934fb75c22a1badb87.
Bad internal merge and other errors.
Change-Id: If9b812916223773ee98354d0805626cf759355fd
Merged-In: Ib3a3f249c278be582de04a583e18de3c0e502d5e
Steven Moreland [Fri, 21 Apr 2017 01:55:08 +0000 (01:55 +0000)]
Revert "resolve merge conflicts of
03e80b462 to oc-dev-plus-aosp"
This reverts commit
40d89431dbad9c7f5820ddbe21dd8a532f58f0f5.
Reason for revert: didn't delete mk
Change-Id: Ib3a3f249c278be582de04a583e18de3c0e502d5e
Steven Moreland [Fri, 21 Apr 2017 01:03:31 +0000 (01:03 +0000)]
resolve merge conflicts of
03e80b462 to oc-dev-plus-aosp
am:
40d89431db
Change-Id: Iaa9b4f107451c4936025231b6eeb0d23454c1d36
Steven Moreland [Fri, 21 Apr 2017 00:42:43 +0000 (17:42 -0700)]
resolve merge conflicts of
03e80b462 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3f41140bf5f10e03667a9e36c29df0d3e90d7bb0
Steven Moreland [Fri, 21 Apr 2017 00:09:25 +0000 (00:09 +0000)]
Merge "(lib)?sensorservice: Android.mk -> Android.bp" am:
9a33cae051
am:
e8d1bd4f67
Change-Id: I7027e846ac5c62e5df1341bafd1598c3c9957c60
Steven Moreland [Fri, 21 Apr 2017 00:06:55 +0000 (00:06 +0000)]
Merge "(lib)?sensorservice: Android.mk -> Android.bp"
am:
9a33cae051
Change-Id: I453692e9058d54edfb8777371814f504d3886ba0
Steven Moreland [Fri, 21 Apr 2017 00:03:10 +0000 (00:03 +0000)]
Merge "(lib)?sensorservice: Android.mk -> Android.bp"
Steven Moreland [Thu, 20 Apr 2017 22:56:38 +0000 (15:56 -0700)]
(lib)?sensorservice: Android.mk -> Android.bp
Test: links
Change-Id: I2ddab32c12bf07044416f983b5cf0ae19cc12ba0
Chia-I Wu [Thu, 20 Apr 2017 19:22:04 +0000 (19:22 +0000)]
Merge "libui: log an error on allocation failure" into oc-dev am:
e937eb866d
am:
73c9215562
Change-Id: Icd329a58d4e4eaf7c6175ffdf2c5b476526fc4aa
Chia-I Wu [Thu, 20 Apr 2017 19:12:14 +0000 (19:12 +0000)]
Merge "libui: log an error on allocation failure" into oc-dev
am:
e937eb866d
Change-Id: I5440bd0a35b0629f637b364b504b29069fe3c146
TreeHugger Robot [Thu, 20 Apr 2017 18:56:25 +0000 (18:56 +0000)]
Merge "libui: log an error on allocation failure" into oc-dev
Colin Cross [Thu, 20 Apr 2017 18:50:45 +0000 (18:50 +0000)]
Merge "Convert inputflinger to Android.bp" am:
b0a4e9bbef am:
ef62f2abe2 am:
f9ff234477
am:
6bebf246a5
Change-Id: I73664c89dbe4258ba169459fee12e65c7855f920
Colin Cross [Thu, 20 Apr 2017 18:10:02 +0000 (18:10 +0000)]
Merge "Convert inputflinger to Android.bp" am:
b0a4e9bbef am:
ef62f2abe2
am:
f9ff234477
Change-Id: Ia0b0186869e717e0dea16dbbbc4a10c9aac6f810
Colin Cross [Thu, 20 Apr 2017 18:07:30 +0000 (18:07 +0000)]
Merge "Convert inputflinger to Android.bp" am:
b0a4e9bbef
am:
ef62f2abe2
Change-Id: Ia902708ff58221e580f152fb5b10a98701b94098
Colin Cross [Thu, 20 Apr 2017 18:04:30 +0000 (18:04 +0000)]
Merge "Convert inputflinger to Android.bp"
am:
b0a4e9bbef
Change-Id: I28a5927c81eea714b0f2a29abae102e74b7771c4
Treehugger Robot [Thu, 20 Apr 2017 17:59:45 +0000 (17:59 +0000)]
Merge "Convert inputflinger to Android.bp"
Okan Arikan [Wed, 12 Apr 2017 18:32:21 +0000 (11:32 -0700)]
Pose flicker fix on some devices
The issue was that when the sensord starts on some devices, the initial
IMU sensor fusion pose timestamps are 0 (the first 20-30). It then
starts sending the timestamps. But the latency model looks into the
latency in the initial samples and fixes the latency estimate.
Therefore the estimated latency was way off.
The solution is checking the pose timestamps before using it.
Bug:
37278649
Test: Restart device and run a VR app.
Change-Id: Ic472cb43b32de5d4af3b19547bdc32e906fbfa6a
Steven Moreland [Thu, 20 Apr 2017 15:54:03 +0000 (15:54 +0000)]
Merge "libbinder: vendor_available" am:
e1b504457d am:
9d7f5c867b am:
d97b15855f
am:
c25327d393
Change-Id: Iaa9853a3e042d2efe04f7e7fef9580b5a1f16521
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
Chia-I Wu [Thu, 20 Apr 2017 05:20:55 +0000 (22:20 -0700)]
libui: log an error on allocation failure
This was on the gralloc0/gralloc1 path, but was missing from the HIDL
gralloc path.
Bug:
37444686
Test: allocate an invalid buffer
Change-Id: If1ea0e27c228d82abbcd6f6290eb8fee423828e7
Steven Moreland [Thu, 20 Apr 2017 04:20:35 +0000 (04:20 +0000)]
Merge "libbinder: vendor_available" am:
e1b504457d am:
9d7f5c867b
am:
d97b15855f
Change-Id: Icb31023a0be7b7a0df377084917fab13fb6bbaaf
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 [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
Merged-In: Iebdc3f4d2d560b0fdf5447dde0ac06df64826bb5
(cherry picked from commit
45a1b9c95de619785b68ce51b1a3e271abc4ffd9)
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
Steven Moreland [Thu, 20 Apr 2017 01:58:27 +0000 (01:58 +0000)]
Merge "libbinder: vendor_available" am:
e1b504457d
am:
9d7f5c867b
Change-Id: I9b29afedaab9487a96c448a7c791ceb059df2bae
Steven Moreland [Thu, 20 Apr 2017 01:46:33 +0000 (01:46 +0000)]
Merge "libbinder: vendor_available"
am:
e1b504457d
Change-Id: I1113c2bd11060d526c46d7f8f9d69e4526dd4ce4
Treehugger Robot [Thu, 20 Apr 2017 01:39:21 +0000 (01:39 +0000)]
Merge "libbinder: vendor_available"
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."
Steven Moreland [Fri, 14 Apr 2017 04:19:48 +0000 (21:19 -0700)]
libbinder: vendor_available
By setting vendor_available, the following may become true:
* a prebuilt library from this release may be used at runtime by
in a later releasse (by vendor code compiled against this release).
so this library shouldn't depend on runtime state that may change
in the future.
* this library may be loaded twice into a single process (potentially
an old version and a newer version). The symbols will be isolated
using linker namespaces, but this may break assumptions about 1
library in 1 process (your singletons will run twice).
Background:
This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.
At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.
It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:
https://android-review.googlesource.com/368372
None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.
Bug:
36426473
Bug:
36079834
Test: m -j libbinder
Test: attempt to compile with BOARD_VNDK_VERSION := current
(cherry picked from commit
3aa761697b93dab3e4b1acf90d14502a79a49219)
Merged-In: Iec94a66adbc852f7f23352307cf36f49a79ee3a6
Change-Id: Iec94a66adbc852f7f23352307cf36f49a79ee3a6
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