OSDN Git Service
Nicolas Geoffray [Mon, 28 Nov 2016 13:33:11 +0000 (13:33 +0000)]
Merge "Adjust installd with new dexopt return values." am:
b29c82b67e
am:
f118868549
Change-Id: I663a65ac5070782052a2a8676bc1df14074a49bb
Nicolas Geoffray [Mon, 28 Nov 2016 13:25:26 +0000 (13:25 +0000)]
Merge "Adjust installd with new dexopt return values."
am:
b29c82b67e
Change-Id: Ib0f3811c5891d6871d7b9d44c615954b06f261c6
Nicolas Geoffray [Mon, 28 Nov 2016 13:15:55 +0000 (13:15 +0000)]
Merge "Adjust installd with new dexopt return values."
Nicolas Geoffray [Fri, 25 Nov 2016 11:33:31 +0000 (11:33 +0000)]
Adjust installd with new dexopt return values.
Bug:
30937355
Test: device boots, mimic system update, apps get updated.
Change-Id: I9539892dfcdd0cc722a292140accd7525ee132d0
Manoj Gupta [Wed, 23 Nov 2016 06:44:06 +0000 (06:44 +0000)]
Merge "Fix clang static analyzer warnings." am:
b10d705f51
am:
87b2535ff8
Change-Id: I24784df53a0574974f822ee01e2a1f13729176c5
Manoj Gupta [Wed, 23 Nov 2016 06:40:36 +0000 (06:40 +0000)]
Merge "Fix clang static analyzer warnings."
am:
b10d705f51
Change-Id: Ibdd7df4af9766b5d00515254cbb8d5e9370a4971
Treehugger Robot [Wed, 23 Nov 2016 06:35:32 +0000 (06:35 +0000)]
Merge "Fix clang static analyzer warnings."
Martijn Coenen [Tue, 22 Nov 2016 09:55:14 +0000 (09:55 +0000)]
Merge "atrace: support HAL services as well." am:
1aea108920
am:
7d7cd0cc88
Change-Id: I52a8b3ffcc4bea2b2adb290de6a989b225f447e4
Martijn Coenen [Tue, 22 Nov 2016 09:49:27 +0000 (09:49 +0000)]
Merge "atrace: support HAL services as well."
am:
1aea108920
Change-Id: Iac0430699cd15f59ed68b41d20010165a50a50e2
Treehugger Robot [Tue, 22 Nov 2016 09:43:23 +0000 (09:43 +0000)]
Merge "atrace: support HAL services as well."
Martijn Coenen [Wed, 16 Nov 2016 15:00:26 +0000 (16:00 +0100)]
atrace: support HAL services as well.
Also poke services that are only registered with
hwbinder, so that they update their props (trace
categories) immediately.
Bug:
31262344
Test: builds, atrace works
Change-Id: I355ddd5f950acc27d598cd972e63f9711426b943
Wei Wang [Sun, 20 Nov 2016 16:31:01 +0000 (16:31 +0000)]
Merge "atrace.rc: move to post-fs trigger" am:
3749a60b42
am:
5b30ae185e
Change-Id: Ibb5370034f45a00e1ec9166abc4a66afc32b4847
Wei Wang [Sun, 20 Nov 2016 16:26:31 +0000 (16:26 +0000)]
Merge "atrace.rc: move to post-fs trigger"
am:
3749a60b42
Change-Id: Ib2675cf4047d6ce1b9b6285538bb7f7be7ed1649
Treehugger Robot [Sun, 20 Nov 2016 16:22:22 +0000 (16:22 +0000)]
Merge "atrace.rc: move to post-fs trigger"
Wei Wang [Sun, 20 Nov 2016 04:49:09 +0000 (20:49 -0800)]
atrace.rc: move to post-fs trigger
Test: manually
Bug:
32025203
Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd
Colin Cross [Fri, 18 Nov 2016 01:58:23 +0000 (01:58 +0000)]
Merge "Fix warnings in framworks/native/opengl/include" am:
d12c9369d5
am:
7354c237ea
Change-Id: I43d772721d8ad9538b0ced7bb9592ad0f1dd0dd8
Colin Cross [Fri, 18 Nov 2016 01:55:54 +0000 (01:55 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"
am:
d12c9369d5
Change-Id: Ifbbccbd890d3ab80910586c52f263e903e36dbbd
Treehugger Robot [Fri, 18 Nov 2016 01:50:49 +0000 (01:50 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"
Evgenii Stepanov [Mon, 14 Nov 2016 19:58:48 +0000 (19:58 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot."" am:
5c58020c00
am:
22d12a89e6
Change-Id: Ie392d157a320fba28e91214af4486d09d671a23a
Evgenii Stepanov [Mon, 14 Nov 2016 19:47:29 +0000 (19:47 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
am:
5c58020c00
Change-Id: I107ce2043fd261b08413418825daf6c35f808228
Evgenii Stepanov [Mon, 14 Nov 2016 19:26:48 +0000 (19:26 +0000)]
Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
Nicolas Geoffray [Mon, 14 Nov 2016 09:41:44 +0000 (09:41 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""" am:
eda1ddf518
am:
45cee75031
Change-Id: Ife44a4f96470e4545a543d22448458b442a3bff7
Nicolas Geoffray [Mon, 14 Nov 2016 09:34:11 +0000 (09:34 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""
am:
eda1ddf518
Change-Id: Idbc246744abd62d0bb647f569968457cf5b85583
Nicolas Geoffray [Mon, 14 Nov 2016 09:24:56 +0000 (09:24 +0000)]
Merge "Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."""
Evgenii Stepanov [Wed, 14 Sep 2016 00:50:46 +0000 (00:50 +0000)]
Revert "Workaround alloc-dealloc-mismatch error on ASan device boot."
This reverts commit
22819276b147e34a80e8ca696be5b3fda68764b9.
The underlying kernel bug has been fixed.
Test: SANITIZE_TARGET=address build should continue working
Change-Id: I6f3938047d9f60357e7bd9bccd3ef36d7686c73b
Nicolas Geoffray [Thu, 10 Nov 2016 10:50:03 +0000 (10:50 +0000)]
Revert "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
Test: device boots, adb shell cmd package compile works.
This reverts commit
5373d3028d53df00c244802f89c8a31a8c1a55a6.
bug:
30937355
Change-Id: Iddab9cc8de866a281672fc3c509d43070c3f56de
Nicolas Geoffray [Wed, 9 Nov 2016 21:48:10 +0000 (21:48 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."" am:
80a4f63d7e
am:
d5417da67b
Change-Id: I532508a618531080f687dfbf7818cd5ec11b3d9e
Nicolas Geoffray [Wed, 9 Nov 2016 21:42:08 +0000 (21:42 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
am:
80a4f63d7e
Change-Id: I02271ca0bbb3ee1d6eb5a8f73d6af0f23e0ab058
Nicolas Geoffray [Wed, 9 Nov 2016 21:32:14 +0000 (21:32 +0000)]
Merge "Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat.""
Nicolas Geoffray [Wed, 9 Nov 2016 21:30:54 +0000 (21:30 +0000)]
Revert "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
Mishandled create_vdex_filename.
bug:
30937355
This reverts commit
196539e9ea6b096826c3489700588c286d8ca9c2.
Change-Id: Idd1a9f9567240899a103547a36dd036219f303cd
Elliott Hughes [Wed, 9 Nov 2016 16:46:04 +0000 (16:46 +0000)]
Merge "Dumpstate's netstat call should use -W." am:
0708c8355f
am:
ae4d6a6c8b
Change-Id: Ia44bef0d5dcb530ee17bcd7467f067ed1ef4b3cb
Elliott Hughes [Wed, 9 Nov 2016 16:40:02 +0000 (16:40 +0000)]
Merge "Dumpstate's netstat call should use -W."
am:
0708c8355f
Change-Id: If0d15f407cb5cd080950c414135a1ebcdf712d77
Elliott Hughes [Wed, 9 Nov 2016 16:30:31 +0000 (16:30 +0000)]
Merge "Dumpstate's netstat call should use -W."
Nicolas Geoffray [Wed, 9 Nov 2016 14:10:35 +0000 (14:10 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat." am:
229d3c289b
am:
6da66c1bf1
Change-Id: Id4b58e3f19f7a93e0947bda20fefb1015ae4c346
Nicolas Geoffray [Wed, 9 Nov 2016 14:04:35 +0000 (14:04 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
am:
229d3c289b
Change-Id: Iab57ff0465b7e72b48c2d93b13e3930160a08704
Nicolas Geoffray [Wed, 9 Nov 2016 13:57:23 +0000 (13:57 +0000)]
Merge "Pass --output-vdex-fd and input-vdex-fd to dex2oat."
Craig Donner [Tue, 8 Nov 2016 20:19:40 +0000 (20:19 +0000)]
Merge "Keep protected content in EGLImage attrs as needed." am:
5a03327fa8
am:
e86b7fb0cf
Change-Id: I6838c4f9c3885a0cc7e27355b5163c132e9f7b3e
Craig Donner [Tue, 8 Nov 2016 20:14:09 +0000 (20:14 +0000)]
Merge "Keep protected content in EGLImage attrs as needed."
am:
5a03327fa8
Change-Id: Id79a4a1548e5c7f4cb504d474f856727bf0b51ee
Treehugger Robot [Tue, 8 Nov 2016 20:06:32 +0000 (20:06 +0000)]
Merge "Keep protected content in EGLImage attrs as needed."
Nicolas Geoffray [Mon, 7 Nov 2016 16:24:05 +0000 (16:24 +0000)]
Pass --output-vdex-fd and input-vdex-fd to dex2oat.
Adjust to new dex2oat flags.
bug:
30937355
Test: device boots
Change-Id: Ieab2b2102a7b9c17b77618538608c47d8ad52e2d
Etan Cohen [Sun, 6 Nov 2016 03:21:54 +0000 (03:21 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
ab180e53b9
am:
3aa7f61eba
Change-Id: I28cc8ef7a2589683fb16b9498ae1c2abfe2bf925
Etan Cohen [Sun, 6 Nov 2016 03:13:51 +0000 (03:13 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
am:
ab180e53b9
Change-Id: I75b3722f37d606e42effc9dee731210df958c7bd
Etan Cohen [Sun, 6 Nov 2016 03:05:39 +0000 (03:05 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
Etan Cohen [Wed, 26 Oct 2016 18:20:17 +0000 (11:20 -0700)]
[NAN-AWARE] Rename NAN to Aware
Rename only (and any reformatting needed to pass lint) - no
functional changes!
(cherry-pick of commit
49f8c84e1872c47716ebc2c04acdc8e3f6192734)
Bug:
32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: I00700206c90c9e6a1a0a2a79248dd571fe43ec26
Change-Id: I6b4b146a470ccbe081fb2f18d75e261a843978e2
liangweikang [Fri, 4 Nov 2016 01:50:04 +0000 (01:50 +0000)]
Merge "binder: print the bad cmd error to android log" am:
2e9ff8c5be
am:
564e686168
Change-Id: Ic6de8bae8f3b138214785e856911d1eef6b4541b
liangweikang [Fri, 4 Nov 2016 01:46:34 +0000 (01:46 +0000)]
Merge "binder: print the bad cmd error to android log"
am:
2e9ff8c5be
Change-Id: I3849ae9043c52305798448b89cb82920a4ec13e4
Treehugger Robot [Fri, 4 Nov 2016 01:43:14 +0000 (01:43 +0000)]
Merge "binder: print the bad cmd error to android log"
Colin Cross [Fri, 4 Nov 2016 00:36:46 +0000 (17:36 -0700)]
Fix warnings in framworks/native/opengl/include
Fix old-style cast warnings by using a macro to do C or C++ style
casts. Remove a visibility attribute being applied to a typedef.
The warnings were being hidden by the use of -isystem to include
frameworks/native/opengl/include.
Bug:
31752268
Test: m -j native
Change-Id: I7db3f7181e3542fc7194e1f18010dd2df5d4c57e
Craig Donner [Thu, 20 Oct 2016 00:18:17 +0000 (17:18 -0700)]
Keep protected content in EGLImage attrs as needed.
When image_crop isn't supported, we also throw away the
protected_content_ext attrs in GLConsumer. Instead, keep them
around if they're used.
Bug:
32222880
Test: manual (cp from internal)
Change-Id: Ic182810cbaacdfaf912c57667f5176d3e47941a9
Manoj Gupta [Wed, 2 Nov 2016 00:30:24 +0000 (17:30 -0700)]
Fix clang static analyzer warnings.
frameworks/native/cmds/flatland/GLHelper.cpp:366:9: warning: Potential
leak of memory pointed to by 'src'
Test: Warning no longer appears
Change-Id: I2721d292cf1f387f34fb2e69f8370f1abff3f01f
liangweikang [Tue, 25 Oct 2016 08:37:54 +0000 (16:37 +0800)]
binder: print the bad cmd error to android log
https://code.google.com/p/android/issues/detail?id=226068
Signed-off-by: liangweikang <liangweikang900911@gmail.com>
Elliott Hughes [Fri, 28 Oct 2016 15:53:02 +0000 (08:53 -0700)]
Dumpstate's netstat call should use -W.
IPv6 addresses (which are quite normal on a real device connected to a
mobile network) are truncated by netstat by default. (80 columns!)
Supplying -W says "I care about seeing the IP addresses more than I
care about fitting on a VT100".
Bug: noticed in bugreport in http://b/
32463933
Test: manual dumpstate run
Change-Id: I6f8b9ee258ceaa2beeca588fc95adb17fe07d0c4
Wei Wang [Thu, 27 Oct 2016 18:19:05 +0000 (18:19 +0000)]
Merge "TextOutput log improvement" am:
3e9e757437
am:
1ccb872a9e
Change-Id: Ic9efec9193ed37c7bbfca966c07224b9e96349fb
Wei Wang [Thu, 27 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Merge "TextOutput log improvement"
am:
3e9e757437
Change-Id: I88fec0002898ec7da19d579d0aa4679b73bfcd53
Treehugger Robot [Thu, 27 Oct 2016 18:05:46 +0000 (18:05 +0000)]
Merge "TextOutput log improvement"
Connor O'Brien [Thu, 27 Oct 2016 18:05:03 +0000 (18:05 +0000)]
Merge "Enable multiple concurrent binderLibTest instances" am:
06d83ad741
am:
12a04a524b
Change-Id: I4f5d47d6d239d0df4b8e994645cd5bde4e45b88f
Connor O'Brien [Thu, 27 Oct 2016 18:00:33 +0000 (18:00 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
am:
06d83ad741
Change-Id: I4df9c55a81801972f1b4cbb56f11d24f5bbc9e1d
Connor O'Brien [Thu, 27 Oct 2016 17:54:14 +0000 (17:54 +0000)]
Merge "Enable multiple concurrent binderLibTest instances"
Connor O'Brien [Thu, 27 Oct 2016 00:58:51 +0000 (17:58 -0700)]
Enable multiple concurrent binderLibTest instances
Each instance tries to register a service with the
same name, so suffix the service name with the
instance's PID to avoid collisions.
Test: Tests run and pass in 2 processes at once
Change-Id: I685b01fbfbad4e9bd3eb6ea06f46ffc157169909
Signed-off-by: Connor O'Brien <connoro@google.com>
Colin Cross [Mon, 24 Oct 2016 18:06:24 +0000 (18:06 +0000)]
Merge "[binder]: Correct the index for getReturnString" am:
a340838895
am:
3a3ed21bac
Change-Id: I155907b463d85dee5327c1b1df47be6d6c5cc3c9
Colin Cross [Mon, 24 Oct 2016 18:02:53 +0000 (18:02 +0000)]
Merge "[binder]: Correct the index for getReturnString"
am:
a340838895
Change-Id: Ide173ea019cceaba9eee1c25edf9fea75acc6caa
Colin Cross [Mon, 24 Oct 2016 17:58:14 +0000 (17:58 +0000)]
Merge "[binder]: Correct the index for getReturnString"
Wei Wang [Fri, 21 Oct 2016 06:18:17 +0000 (23:18 -0700)]
TextOutput log improvement
Add unit tests for log functions
Add support of std::endl
Add back support of char
Add back support of bool
Add back support of String16
Fix a build warning on union initialization
Test: run /data/nativetest(64)/binderTextOutputTest
Bug:
32181382
Change-Id: I4030b142beacc5dcd88a10904710fd6e19f7240c
Felipe Leme [Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)]
DO NOT MERGE. Added a is_zipping() function. am:
03974984bf
am:
40e091cd8f
Change-Id: Ia9e559632ea3c5e37063e1433c2a7928f8313625
Felipe Leme [Fri, 21 Oct 2016 23:53:47 +0000 (23:53 +0000)]
DO NOT MERGE. Added a is_zipping() function.
am:
03974984bf
Change-Id: Ib14224bf42315b3b1633662fac1f88610a824296
Felipe Leme [Fri, 21 Oct 2016 18:38:26 +0000 (11:38 -0700)]
DO NOT MERGE. Added a is_zipping() function.
BUG:
32219165
Fixes:
32335112
Change-Id: I2bc630f9c840ccd3a2e0474ed16a766e8a405ad8
Mark Salyzyn [Fri, 21 Oct 2016 18:16:22 +0000 (18:16 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties" am:
430b3667ec
am:
439dbe3bc3
Change-Id: Ia996de428a869552937ec690b4d02af7611c2bc1
Mark Salyzyn [Fri, 21 Oct 2016 18:08:51 +0000 (18:08 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties"
am:
430b3667ec
Change-Id: I150663d5108340f1434f8ec48eb6cd9d4722603f
Mark Salyzyn [Fri, 21 Oct 2016 18:02:12 +0000 (18:02 +0000)]
Merge "dumpstate: Use private interfaces for buffer size properties"
songjinshi [Tue, 18 Oct 2016 13:05:56 +0000 (21:05 +0800)]
[binder]: Correct the index for getReturnString
The cmd code can not as the index drectly.
Change-Id: Icddad46faef7a77acbd7edf118c081ac10501f47
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Mark Salyzyn [Tue, 27 Sep 2016 21:55:27 +0000 (14:55 -0700)]
dumpstate: Use private interfaces for buffer size properties
Used to estimate the timeout to be applied to the logcat command.
This transition represents some technical debt and optimization.
Test: collect bugreport and confirm logcat output
Bug:
31750617
Bug:
21555259
Change-Id: I512b969a4a796fce468907494814315e30c5299d
Dan Albert [Thu, 20 Oct 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Add licenses to ndk_headers." am:
8c9cd8a215
am:
1bef51ae50
Change-Id: I862f1bbe3552645cf7a1437d986c3620a1bdb0f5
Dan Albert [Thu, 20 Oct 2016 22:16:56 +0000 (22:16 +0000)]
Merge "Add licenses to ndk_headers."
am:
8c9cd8a215
Change-Id: I6a49ab856d6f52597067be0df5e34b9459efdb33
Treehugger Robot [Thu, 20 Oct 2016 22:12:39 +0000 (22:12 +0000)]
Merge "Add licenses to ndk_headers."
Dan Albert [Thu, 20 Oct 2016 17:14:30 +0000 (10:14 -0700)]
Add licenses to ndk_headers.
Test: make ndk
Bug: None
Change-Id: Ia113ea42b1d62d87dfbb2fc456428c7db50a98f1
Wei Wang [Thu, 20 Oct 2016 16:57:24 +0000 (16:57 +0000)]
Merge "Fix log function for potential overflow" am:
2e5c7798e1
am:
10155def9a
Change-Id: Ia91d711168bf9e69c583b1a933d69de94916b449
Wei Wang [Thu, 20 Oct 2016 16:49:03 +0000 (16:49 +0000)]
Merge "Fix log function for potential overflow"
am:
2e5c7798e1
Change-Id: I17a6c6a035e6e85777d0f14db819452d770856ae
Wei Wang [Thu, 20 Oct 2016 16:41:20 +0000 (16:41 +0000)]
Merge "Fix log function for potential overflow"
Wei Wang [Wed, 19 Oct 2016 17:23:59 +0000 (10:23 -0700)]
Fix log function for potential overflow
On LP64 system, unsigned long can be 64bit
Also clean out unused static variables.
Test: flash on ARM64 device
Bug:
32181382
Change-Id: I44b7ea8a6588c475a3979d7bddeb08da7f54c27a
Steve Pfetsch [Wed, 19 Oct 2016 05:01:18 +0000 (05:01 +0000)]
services: surfaceflinger: ASAN fix am:
1d3df546d5
am:
ff06017cfe
Change-Id: Ie1f5418312cffc6b1a1ec9a7fd0194babaf9d6d9
Steve Pfetsch [Wed, 19 Oct 2016 04:53:17 +0000 (04:53 +0000)]
services: surfaceflinger: ASAN fix
am:
1d3df546d5
Change-Id: If0447f27ab0a1c3033b0a87fc8426f53c2a82ac5
Steve Pfetsch [Fri, 30 Sep 2016 00:16:29 +0000 (17:16 -0700)]
services: surfaceflinger: ASAN fix
Move layer removal to the main thread, while the display is on.
Bug:
30281222
Change-Id: Id9f956c1e626819734868340e7fa12abf257b702
Dan Willemsen [Tue, 18 Oct 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Convert to Android.bp" am:
99de09fe7f -s ours
am:
cc3c973f5f -s ours
Change-Id: I825715a956f44a0b4371a1526a054c05fac05326
Dan Willemsen [Tue, 18 Oct 2016 23:36:42 +0000 (23:36 +0000)]
Merge "Convert to Android.bp"
am:
99de09fe7f -s ours
Change-Id: I16fbbe0cdeffe80b7b92148f696ec2db848cd4cf
Dan Willemsen [Tue, 18 Oct 2016 23:26:08 +0000 (23:26 +0000)]
Merge "Convert to Android.bp"
Dan Willemsen [Tue, 4 Oct 2016 06:56:51 +0000 (23:56 -0700)]
Convert to Android.bp
See build/soong/README.md for more information.
Test: mmma -j frameworks/native/{libs/gui,opengl/libs}
Change-Id: I90b4e299ebd2a38afb6642bc242d4ad5424fb901
Merged-In: I90b4e299ebd2a38afb6642bc242d4ad5424fb901
Dan Willemsen [Tue, 18 Oct 2016 20:59:48 +0000 (20:59 +0000)]
Convert to Android.bp
am:
3106c1c4fc
Change-Id: I4e0b4bbe420201473a345ed19eaee753f45a4b80
Dan Willemsen [Tue, 4 Oct 2016 06:56:51 +0000 (23:56 -0700)]
Convert to Android.bp
See build/soong/README.md for more information.
Test: mmma -j frameworks/native/{libs/gui,opengl/libs}
Change-Id: I90b4e299ebd2a38afb6642bc242d4ad5424fb901
Fabien Sanglard [Tue, 18 Oct 2016 18:58:42 +0000 (18:58 +0000)]
Merge "Fix surfaceflinger file descriptor leak" am:
af2fbb0ccc
am:
ee87482e6d
Change-Id: I87f37b1ecc15b0b7800c0269f5a27df59125c73f
Fabien Sanglard [Tue, 18 Oct 2016 18:51:46 +0000 (18:51 +0000)]
Merge "Fix surfaceflinger file descriptor leak"
am:
af2fbb0ccc
Change-Id: If21d062e144dd13064c0c3e8021523a8bf20b864
Fabien Sanglard [Tue, 18 Oct 2016 18:41:44 +0000 (18:41 +0000)]
Merge "Fix surfaceflinger file descriptor leak"
Matthew Bouyack [Tue, 18 Oct 2016 17:16:24 +0000 (17:16 +0000)]
Merge changes I5d907c33,Ibce48cd2 into cw-f-dev
am:
a34aade39a
Change-Id: Ibbb956b813905db2942aedca379830add4f0ba53
Matthew Bouyack [Tue, 18 Oct 2016 17:16:22 +0000 (17:16 +0000)]
In SurfaceFlinger, test fence before merging
am:
377c203375
Change-Id: Icfbcbe58de9f6930f06774f47e6576ec523115bd
Dan Stoza [Tue, 18 Oct 2016 17:16:12 +0000 (17:16 +0000)]
libui: Change hasSignaled to return optional<bool>
am:
6db42ac36e
Change-Id: I9b845b9f8c0e752733cca4ee50b2f92573e96a28
Nick Vaccaro [Tue, 18 Oct 2016 17:16:00 +0000 (17:16 +0000)]
Sensors: Add WRIST_TILT_GESTURE as wake sensor
am:
5e7f79bf29
Change-Id: Iffcd4b96d1156d314b42e89f8114b9b1de48d258
Matthew Bouyack [Tue, 18 Oct 2016 17:10:30 +0000 (17:10 +0000)]
Merge changes I5d907c33,Ibce48cd2 into cw-f-dev
* changes:
In SurfaceFlinger, test fence before merging
libui: Change hasSignaled to return optional<bool>
Nick Vaccaro [Mon, 17 Oct 2016 22:40:51 +0000 (15:40 -0700)]
Sensors: Add WRIST_TILT_GESTURE as wake sensor
Include WRIST_TILT_GESTURE sensor type when determining if
a sensor is a wake sensor or not in getDefaultSensor().
Change-Id: Ib9ae3990e063848163edd34be2ec021ed518e346
Matthew Bouyack [Fri, 7 Oct 2016 22:06:15 +0000 (15:06 -0700)]
In SurfaceFlinger, test fence before merging
If the old fence for a given layer has already expired, we can replace
it with the new fence rather than merging the two.
This saves 300-400us per frame on Android Wear
Change-Id: I5d907c336c7383ae4e2e0f71e42f23749494a359
Dan Stoza [Thu, 13 Oct 2016 16:45:00 +0000 (09:45 -0700)]
libui: Change hasSignaled to return optional<bool>
Since the android::Fence::wait() call can possibly return an error,
we need some way of indicating to the caller of hasSignaled that a
fence that has not yet signaled (because it is in an error state) will
never signal. To do this, we return an optional<bool>, where true and
false indicate both that the fence is valid and that it has or hasn't
signaled. If an error is returned from wait(), we return a default
optional value (that is neither true nor false).
Test: m
Change-Id: Ibce48cd2e71ddb8ccf6cabe3284afe0efca8c132
Fabien Sanglard [Sat, 15 Oct 2016 01:13:33 +0000 (18:13 -0700)]
Fix surfaceflinger file descriptor leak
If a producer queues a buffer after a screen resize, the buffer
will not be removed from the buffer queue, resulting in a leak of
file descriptor.
Test: Fix was tested by the bug reporter (ARM).
Bug:
32012717
Change-Id: I3b7b0745d5fbdee97fc8df2db399c1a2fcdeb375
OSDN Git Service
