OSDN Git Service
Richard Uhler [Wed, 11 Jan 2017 10:58:41 +0000 (10:58 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am:
6c207a7d96 am:
83c87d4985
am:
3977570f9f
Change-Id: Ib75da8118af0cef7bd06a9a88478529b64cd328d
Richard Uhler [Wed, 11 Jan 2017 10:48:12 +0000 (10:48 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am:
6c207a7d96
am:
83c87d4985
Change-Id: I72c03782c82ff40cef7c520adc6d694b52289951
Richard Uhler [Wed, 11 Jan 2017 10:37:44 +0000 (10:37 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am:
6c207a7d96
Change-Id: I82f59649db71b255abdbafae8190f40974534f83
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Jeff Sharkey [Tue, 10 Jan 2017 04:47:56 +0000 (04:47 +0000)]
Merge "Methods to calculate user and external disk usage." am:
4d9746d7a3 am:
15e80e0436
am:
e5281b7f9b
Change-Id: Ie7f29f8b10dc1e9158c7574e9836e27e3fda62eb
Jeff Sharkey [Tue, 10 Jan 2017 04:43:03 +0000 (04:43 +0000)]
Merge "Methods to calculate user and external disk usage." am:
4d9746d7a3
am:
15e80e0436
Change-Id: I63799087ee8b62b68da1f39ee2495b54481bd866
Jeff Sharkey [Tue, 10 Jan 2017 04:38:23 +0000 (04:38 +0000)]
Merge "Methods to calculate user and external disk usage."
am:
4d9746d7a3
Change-Id: I7229c883efc6078b4fe3aa8231912eda1073ae48
Jeff Sharkey [Tue, 10 Jan 2017 04:30:46 +0000 (04:30 +0000)]
Merge "Methods to calculate user and external disk usage."
Jeff Sharkey [Sat, 7 Jan 2017 16:19:35 +0000 (09:19 -0700)]
Methods to calculate user and external disk usage.
Add method to calculate user disk usage, which will be faster than
making a Binder call for every single appId under a user. Add method
to calculate external disk usage, which uses file extensions to track
usage with "audio", "video", and "images" categories.
Add script to generate optimized file extension matcher logic.
Start measuring internal and external storage space separately; new
GIDs are coming in a future CL. Pass down all package names, inodes,
and code paths, since shared UIDs host more than one.
Test: builds, boots, stats are consistent
Bug:
27948817,
32206268
Change-Id: Icb9843ac5159e0e5f1503d9b64e0bcae407e1a5d
Jesse Hall [Mon, 9 Jan 2017 05:24:33 +0000 (05:24 +0000)]
Merge "Surface: Use async lock/unlock in copyBlt" am:
b73de86f13 am:
e29dda829d
am:
55f599a079
Change-Id: I1f7603e0808a3794d708e788818d83814c10dcb3
Jesse Hall [Mon, 9 Jan 2017 05:20:03 +0000 (05:20 +0000)]
Merge "Surface: Use async lock/unlock in copyBlt" am:
b73de86f13
am:
e29dda829d
Change-Id: I753acee7ab8f0c0ca62a5606ae1b5c44e2314fd3
Jesse Hall [Mon, 9 Jan 2017 05:15:04 +0000 (05:15 +0000)]
Merge "Surface: Use async lock/unlock in copyBlt"
am:
b73de86f13
Change-Id: I5312414d1e66cc0dbd3b346f14c14eb1ff90e6da
Jesse Hall [Mon, 9 Jan 2017 05:07:29 +0000 (05:07 +0000)]
Merge "Surface: Use async lock/unlock in copyBlt"
Jesse Hall [Sat, 7 Jan 2017 23:58:21 +0000 (23:58 +0000)]
Merge "egl: Add NULL check for num_config parameter" am:
64990fc0b9 am:
ccaf6bf34a
am:
68d96292a6
Change-Id: Icde1d5dc8ca191b752097e85cfb7e94857bcb27b
Jesse Hall [Sat, 7 Jan 2017 23:53:50 +0000 (23:53 +0000)]
Merge "egl: Add NULL check for num_config parameter" am:
64990fc0b9
am:
ccaf6bf34a
Change-Id: Ifada0489e548bbbfa7378b408a1268b7a7b4da03
Jesse Hall [Sat, 7 Jan 2017 23:49:20 +0000 (23:49 +0000)]
Merge "egl: Add NULL check for num_config parameter"
am:
64990fc0b9
Change-Id: I1000300a6ca1a5ee9013f68aacd8541cdfac48b1
Jesse Hall [Sat, 7 Jan 2017 23:44:22 +0000 (23:44 +0000)]
Merge "egl: Add NULL check for num_config parameter"
Dan Albert [Fri, 6 Jan 2017 21:14:14 +0000 (21:14 +0000)]
Merge "Unversion NDK stub libraries." am:
3944ec426b am:
ce80f3f4b0
am:
e6545f3cf3
Change-Id: Ibbcbd7ae010cf824c7e26aef15af1e788210e2de
Dan Albert [Fri, 6 Jan 2017 21:10:49 +0000 (21:10 +0000)]
Merge "Unversion NDK stub libraries." am:
3944ec426b
am:
ce80f3f4b0
Change-Id: I3871fc9393cdabe0eebae30f87d2d2555ddf6dfc
Dan Albert [Fri, 6 Jan 2017 21:03:17 +0000 (21:03 +0000)]
Merge "Unversion NDK stub libraries."
am:
3944ec426b
Change-Id: I3266580d6f41b32ec8775e0bb73c66303ed5fa62
Treehugger Robot [Fri, 6 Jan 2017 20:53:07 +0000 (20:53 +0000)]
Merge "Unversion NDK stub libraries."
Dan Albert [Thu, 5 Jan 2017 23:58:50 +0000 (15:58 -0800)]
Unversion NDK stub libraries.
The system versions of these libraries aren't versioned yet.
Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I73e4ebcac151c4039df6261aa6674accb0204706
Steve Paik [Fri, 6 Jan 2017 02:21:29 +0000 (02:21 +0000)]
Merge "Add android/log.h to Rect.h" am:
a422103c90 am:
20b8c55a5e
am:
a58d700c85
Change-Id: Ie53f306995ab6876fa4e599b174d99131aaafe4f
Steve Paik [Fri, 6 Jan 2017 02:17:58 +0000 (02:17 +0000)]
Merge "Add android/log.h to Rect.h" am:
a422103c90
am:
20b8c55a5e
Change-Id: I48190e464c2667edaf8cf71a27581c8bd929c1be
Steve Paik [Fri, 6 Jan 2017 02:14:28 +0000 (02:14 +0000)]
Merge "Add android/log.h to Rect.h"
am:
a422103c90
Change-Id: I47eecbef3964168a075554b39135286254854472
Treehugger Robot [Fri, 6 Jan 2017 02:08:15 +0000 (02:08 +0000)]
Merge "Add android/log.h to Rect.h"
Steve Paik [Thu, 5 Jan 2017 17:09:56 +0000 (09:09 -0800)]
Add android/log.h to Rect.h
Rect.h uses definitions from log.h.
Test: Build succeeds when C file doesn't include log.h.
Change-Id: Ia85372ca61edafadea92165121dc6fbd1546674b
Richard Uhler [Thu, 8 Dec 2016 10:46:35 +0000 (10:46 +0000)]
Cleanup code given PATCHOAT_FOR_RELOCATION has been removed.
Test: make, device boots.
Bug:
33192586
Change-Id: Ic3937708a7dfcd16f02cf68fc20674ec457d60b7
Nicolas Geoffray [Thu, 5 Jan 2017 15:07:34 +0000 (15:07 +0000)]
Merge "Pass the same fd when compiling due to boot image update." am:
4f8c1fd2ea am:
dd4268dc5e
am:
5e28b3ea17
Change-Id: Ie888266def019012e15436db981f5cba87757dce
Nicolas Geoffray [Thu, 5 Jan 2017 15:04:05 +0000 (15:04 +0000)]
Merge "Pass the same fd when compiling due to boot image update." am:
4f8c1fd2ea
am:
dd4268dc5e
Change-Id: I996ab33bafcba4480a99d81496864d5157bda316
Nicolas Geoffray [Thu, 5 Jan 2017 15:01:32 +0000 (15:01 +0000)]
Merge "Pass the same fd when compiling due to boot image update."
am:
4f8c1fd2ea
Change-Id: Ifbc81ad7ffebdcb2eb40e279c558899ec1dce505
Treehugger Robot [Thu, 5 Jan 2017 14:56:01 +0000 (14:56 +0000)]
Merge "Pass the same fd when compiling due to boot image update."
Nicolas Geoffray [Tue, 20 Dec 2016 15:03:56 +0000 (15:03 +0000)]
Pass the same fd when compiling due to boot image update.
Test: device boots, apps get installed, OTA uses same vdex.
Change-Id: I913062630640f31a18d23b2f62afd74986322e6a
Francis Hart [Fri, 9 Jan 2015 09:10:54 +0000 (11:10 +0200)]
Surface: Use async lock/unlock in copyBlt
The Surface::lock() function now uses the asynchronous versions of
gralloc lock/unlock when copying the previously drawn content to the
backbuffer. This allows for optimisations in the gralloc module
implementation and so can improve performance and avoid CPU waits.
Change-Id: I57193f327db2ff0422e1b58b3484f613201d994c
Martijn Coenen [Thu, 5 Jan 2017 09:58:44 +0000 (09:58 +0000)]
Merge "Callback elision for HIDL interfaces." am:
b7ee96a666 am:
d390a8291a
am:
8824b5252e
Change-Id: I6902f398a0b80b6c077b60cc71bec63b900d7493
Martijn Coenen [Thu, 5 Jan 2017 09:52:45 +0000 (09:52 +0000)]
Merge "Callback elision for HIDL interfaces." am:
b7ee96a666
am:
d390a8291a
Change-Id: I6977094aa5a97d82b51c18f605e258046c488c7e
Martijn Coenen [Thu, 5 Jan 2017 09:46:55 +0000 (09:46 +0000)]
Merge "Callback elision for HIDL interfaces."
am:
b7ee96a666
Change-Id: I2d71b02f11d16c95830adbca36f77345ba58cafa
Martijn Coenen [Thu, 5 Jan 2017 09:40:55 +0000 (09:40 +0000)]
Merge "Callback elision for HIDL interfaces."
Martijn Coenen [Mon, 2 Jan 2017 14:17:11 +0000 (15:17 +0100)]
Callback elision for HIDL interfaces.
Test: mma
Bug:
31380743
Change-Id: I33080b61d6233b63106b2602a628bfcdaa878a90
Francis Hart [Wed, 4 Jan 2017 20:43:23 +0000 (20:43 +0000)]
Merge "Surface: Ensure synchronisation of copyBlt" am:
88f77814a1 am:
5a2dcde971
am:
11d80ae93e
Change-Id: I955ce5a325d6dd2fbc42eaeb59c37a07aa1c9a6b
Francis Hart [Wed, 4 Jan 2017 20:41:52 +0000 (20:41 +0000)]
Merge "Surface: Ensure synchronisation of copyBlt" am:
88f77814a1
am:
5a2dcde971
Change-Id: Ifb17a3d79f367bf22e01746209453f8b36bb35b5
Francis Hart [Wed, 4 Jan 2017 20:38:52 +0000 (20:38 +0000)]
Merge "Surface: Ensure synchronisation of copyBlt"
am:
88f77814a1
Change-Id: If8fe2dde08a1a850029e1d9ca6a7ae965f2aa8ab
Treehugger Robot [Wed, 4 Jan 2017 20:33:09 +0000 (20:33 +0000)]
Merge "Surface: Ensure synchronisation of copyBlt"
Dan Albert [Wed, 4 Jan 2017 19:11:27 +0000 (19:11 +0000)]
Merge "Mark libGLESv3 as unversioned until android-24." am:
a09d0363fd am:
3ee6686fdd
am:
16c25d8168
Change-Id: I45214880c98d4b46c50ba0c3179097e48b0f37b3
Dan Albert [Wed, 4 Jan 2017 19:08:56 +0000 (19:08 +0000)]
Merge "Mark libGLESv3 as unversioned until android-24." am:
a09d0363fd
am:
3ee6686fdd
Change-Id: I6ed0b6e51ddb3cd8c20e4a3d771ddff946c0b6ff
Dan Albert [Wed, 4 Jan 2017 19:06:28 +0000 (19:06 +0000)]
Merge "Mark libGLESv3 as unversioned until android-24."
am:
a09d0363fd
Change-Id: Ic902107fc0f9f78fa9ab124c99cbb5f976ebbe61
Treehugger Robot [Wed, 4 Jan 2017 19:00:36 +0000 (19:00 +0000)]
Merge "Mark libGLESv3 as unversioned until android-24."
Jeff Sharkey [Tue, 3 Jan 2017 23:46:07 +0000 (23:46 +0000)]
Merge "Reference profiles use shared GID for user 0." am:
226f77d87a am:
ac437f476f
am:
93d4073bc9
Change-Id: I011fb20fe94cd9717bbd3348a27b7c67cc4c2f08
Jeff Sharkey [Tue, 3 Jan 2017 23:44:06 +0000 (23:44 +0000)]
Merge "Reference profiles use shared GID for user 0." am:
226f77d87a
am:
ac437f476f
Change-Id: I937eb89caebc9a750adc4529f4a3620f8840cccf
Jeff Sharkey [Tue, 3 Jan 2017 23:41:34 +0000 (23:41 +0000)]
Merge "Reference profiles use shared GID for user 0."
am:
226f77d87a
Change-Id: I3c4d10f9483f99f3db4b2b1ff53ab62cd0b567db
Jeff Sharkey [Tue, 3 Jan 2017 23:37:00 +0000 (23:37 +0000)]
Merge "Reference profiles use shared GID for user 0."
Dan Albert [Tue, 3 Jan 2017 23:18:48 +0000 (15:18 -0800)]
Mark libGLESv3 as unversioned until android-24.
Test: readelf on android-23 and android-24 outputs to check version
information.
Bug: https://github.com/android-ndk/ndk/issues/265
Change-Id: I4a9b50b015567c64b75f09e8414682d314a86bc4
Jeff Sharkey [Tue, 3 Jan 2017 21:33:50 +0000 (14:33 -0700)]
Reference profiles use shared GID for user 0.
Test: builds, boots
Bug:
33977235
Change-Id: I4de3852b3f230a6dc874a630e3c1b9fff2d83169
Jeff Sharkey [Tue, 3 Jan 2017 19:48:46 +0000 (19:48 +0000)]
Merge "Offer to measure disk stats using quotas." am:
8aed997c14 am:
5fcfd07918
am:
c7cd1acccd
Change-Id: I936632b80fb29dfdd5b201f0a86ee87e89931786
Jeff Sharkey [Tue, 3 Jan 2017 19:31:46 +0000 (19:31 +0000)]
Merge "Offer to measure disk stats using quotas." am:
8aed997c14
am:
5fcfd07918
Change-Id: I5aaeadb2167ed5b4e4bcfc2ddbd86a05a62e30d1
Jeff Sharkey [Tue, 3 Jan 2017 19:24:09 +0000 (19:24 +0000)]
Merge "Offer to measure disk stats using quotas."
am:
8aed997c14
Change-Id: I17e1355805fa2c439331b0a9814ce5160e0bd168
Jeff Sharkey [Tue, 3 Jan 2017 19:08:07 +0000 (19:08 +0000)]
Merge "Offer to measure disk stats using quotas."
Jeff Sharkey [Tue, 13 Dec 2016 00:32:56 +0000 (17:32 -0700)]
Offer to measure disk stats using quotas.
Now we're getting somewhere! This CL starts using quotactl() to read
UID/GID quota statistics when called with FLAG_USE_QUOTA, otherwise
it continues using the old heavy-weight traversal for calculation.
We now set the recently defined per-app GID used for identifying
cached data, and we use the sticky GID bit on cache directories to
ensure that newly created data inherits the GID for tracking
purposes. For any existing apps during an upgrade, an initial
bootstrapping case will recursively set this new GID.
This change also shuffles around a bunch of the tedious manual
accounting logic so that we exactly match the new quota statistics.
Test: builds, boots, quota stats match manual stats
Bug:
27948817
Change-Id: I8512c3193ce698f197a3f446e625d6a1c74e7649
Android Build Merger (Role) [Thu, 29 Dec 2016 22:04:55 +0000 (22:04 +0000)]
Merge "gralloc1: Acquire mutex early in release am:
56ec3afb84 am:
3b3a5bb115" into nyc-mr2-dev-plus-aosp
Ajit Kumar [Thu, 29 Dec 2016 22:04:45 +0000 (22:04 +0000)]
gralloc1: Acquire mutex early in release am:
56ec3afb84
am:
37aa42d24b
Change-Id: I8850cbadc795215f149755acd8f84088b2b4aa8f
Ajit Kumar [Thu, 29 Dec 2016 22:04:44 +0000 (22:04 +0000)]
gralloc1: Acquire mutex early in release am:
56ec3afb84
am:
3b3a5bb115
Change-Id: I5d444f0c06c9b342b0ef4085d67946ba1f25f698
Ajit Kumar [Thu, 29 Dec 2016 21:56:44 +0000 (21:56 +0000)]
gralloc1: Acquire mutex early in release
am:
56ec3afb84
Change-Id: Iffcf6f2f95e9b70797080ceb6267679ec2e7e1a3
Ajit Kumar [Thu, 29 Dec 2016 21:56:44 +0000 (21:56 +0000)]
gralloc1: Acquire mutex early in release
am:
56ec3afb84
Change-Id: I7aaea43b24c8aa482d557057f3d715b56bdf4cec
Ajit Kumar [Fri, 25 Nov 2016 06:38:53 +0000 (12:08 +0530)]
gralloc1: Acquire mutex early in release
Due race condition between release and retain calls, retain return stale handle.
Which results in crash in SurfaceFlinger.
Fix crash by acquiring mutex early in release function.
Bug:
32384569
Change-Id: I9130f5864a53ef208dc1ad8ecf698f1847548285
Mark Salyzyn [Wed, 28 Dec 2016 17:11:38 +0000 (17:11 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am:
1efda0b1d6 am:
7e92307cd8
am:
430f62090c
Change-Id: I8bbed9204718da324f0bdeceb7b8156cb315e900
Mark Salyzyn [Wed, 28 Dec 2016 17:04:37 +0000 (17:04 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am:
1efda0b1d6
am:
7e92307cd8
Change-Id: I1523bfc0794fe8463fb6134ae8d8c5902947de8b
Mark Salyzyn [Wed, 28 Dec 2016 16:58:07 +0000 (16:58 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
am:
1efda0b1d6
Change-Id: I263fa3a582bbff546f1281205b539258ee5dab49
Mark Salyzyn [Wed, 28 Dec 2016 16:48:57 +0000 (16:48 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
Mark Salyzyn [Thu, 29 Sep 2016 15:08:05 +0000 (08:08 -0700)]
Replace cutils/log.h and rationalize log/log.h and android/log.h
- cutils/log.h treat as deprecated and lead by example
- android/log.h to be used instead of log/log.h if required
- add system includes that are assumed as side effects of log.h
- modules that use SLOG should use SLOG for all logging (installd)
- define LOG_TAG first
- remove logging infrastructure if not used
Test: build
Bug:
31289077
Change-Id: Iea147a0104c7ab7f12451304131d6500f42141e7
Yifan Hong [Thu, 22 Dec 2016 18:23:35 +0000 (18:23 +0000)]
Merge "Update for hiding Status from Return<T> object." am:
c47aa53c84 am:
e6d3ac9834
am:
672886dfdd
Change-Id: If28f500f8ac03b26616fd3989f495862352076a6
Yifan Hong [Thu, 22 Dec 2016 18:19:12 +0000 (18:19 +0000)]
Merge "Update for hiding Status from Return<T> object." am:
c47aa53c84
am:
e6d3ac9834
Change-Id: Ied0f1916b10b4f2edaa713716284acef1f5e3721
Yifan Hong [Thu, 22 Dec 2016 18:16:15 +0000 (18:16 +0000)]
Merge "Update for hiding Status from Return<T> object."
am:
c47aa53c84
Change-Id: If4e92201b4f3a21925c9a2644fa8fa76d0ce7d18
Yifan Hong [Thu, 22 Dec 2016 18:04:15 +0000 (18:04 +0000)]
Merge "Update for hiding Status from Return<T> object."
Jeff Sharkey [Wed, 21 Dec 2016 19:10:36 +0000 (19:10 +0000)]
Merge "Only log restorecon changes for existing dirs." am:
ee080ea229 am:
ed8915cc2c
am:
4500fde965
Change-Id: I2dd392bf176d795f26a4b497971a177d96746a63
Jeff Sharkey [Wed, 21 Dec 2016 19:03:48 +0000 (19:03 +0000)]
Merge "Only log restorecon changes for existing dirs." am:
ee080ea229
am:
ed8915cc2c
Change-Id: I3895295399a51b93ad5dea76d8d346591d6ca178
Jeff Sharkey [Wed, 21 Dec 2016 18:58:21 +0000 (18:58 +0000)]
Merge "Only log restorecon changes for existing dirs."
am:
ee080ea229
Change-Id: Iac6ca0bdbd39efc2258efd354dfd054f6a6d026e
Yifan Hong [Wed, 21 Dec 2016 18:47:56 +0000 (10:47 -0800)]
Update for hiding Status from Return<T> object.
Test: compiles
Change-Id: Ie32514f34efaa1188f34f662b194b60d83c20bf0
Jeff Sharkey [Wed, 21 Dec 2016 18:46:27 +0000 (18:46 +0000)]
Merge "Only log restorecon changes for existing dirs."
Jeff Sharkey [Wed, 21 Dec 2016 16:33:55 +0000 (09:33 -0700)]
Only log restorecon changes for existing dirs.
If we just created an app private data directory, we're always going
to be relabeling it, so don't log in that case. Continue logging if
something caused us to relabel an existing app data directory.
Test: builds, boots, only logs for existing dirs
Bug:
31958779
Change-Id: Id03f7c18aed191a4c7fb9dcf9380136c93798a4b
Jeff Sharkey [Tue, 20 Dec 2016 01:25:29 +0000 (01:25 +0000)]
Merge "Remove ~1/3 of the installd calls at boot." am:
ed04f3c7e5 am:
3f79c64976
am:
32aaf887ef
Change-Id: I82bb9ca769fdc761a04a667c3c013a6f45fc5c03
Jeff Sharkey [Tue, 20 Dec 2016 01:17:42 +0000 (01:17 +0000)]
Merge "Remove ~1/3 of the installd calls at boot." am:
ed04f3c7e5
am:
3f79c64976
Change-Id: I20e68b8a24f2242160110df51d673d18a127d64e
Jeff Sharkey [Tue, 20 Dec 2016 01:13:41 +0000 (01:13 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
am:
ed04f3c7e5
Change-Id: Id68b901ea2c12815df1d4c6e83e789101663870c
Treehugger Robot [Tue, 20 Dec 2016 01:06:22 +0000 (01:06 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
Jeff Sharkey [Mon, 19 Dec 2016 23:39:18 +0000 (16:39 -0700)]
Remove ~1/3 of the installd calls at boot.
When preparing CE storage for an app, we always perform a second call
to extract any newly created CE directory inode. Let's simplify this
and just return the inode number from the createAppData() call.
Test: builds, boots, reads CE inodes after wipe
Bug:
33463450
Change-Id: I68485e4b9b49e9da7b3ac7c66f50c6abc750b7e3
Peng Xu [Mon, 19 Dec 2016 21:08:40 +0000 (21:08 +0000)]
[sensorservice] Init batterystats service when needed
am:
0f48c45ec0
Change-Id: Ib22209fa76a7756566a8606aca2885025ae3cb91
Peng Xu [Wed, 30 Nov 2016 01:54:50 +0000 (17:54 -0800)]
[sensorservice] Init batterystats service when needed
This avoid race condition at parallel services start up that
may results in sensor power usage not being properly recorded.
Test: check all sensors, they still work
Bug:
33199244
Bug:
33623300
Change-Id: I48946667db54fc72d9be6c13b981b44d1bab88c2
(cherry picked from commit
0a031596e12ce0f081b9ee116f48f4f4635d516e)
Peng Xu [Sat, 17 Dec 2016 00:32:35 +0000 (00:32 +0000)]
Merge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function" am:
8d24d0022b am:
36e86c3772
am:
069953e7a0
Change-Id: Ibb20cf554624c65c8f27c1216fbc0e796fcee1fc
Peng Xu [Sat, 17 Dec 2016 00:24:25 +0000 (00:24 +0000)]
Merge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function" am:
8d24d0022b
am:
36e86c3772
Change-Id: Ic55880154809cdd8fb338011ad987841f9d09443
Peng Xu [Sat, 17 Dec 2016 00:15:04 +0000 (00:15 +0000)]
Merge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function"
am:
8d24d0022b
Change-Id: Ibd1faaf9c8a881a4fddcfa19e99357bb7ad13f0a
Peng Xu [Sat, 17 Dec 2016 00:02:02 +0000 (00:02 +0000)]
Merge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function"
Daniel Koch [Fri, 16 Dec 2016 02:59:17 +0000 (02:59 +0000)]
libvulkan: add NULL check to DestroySwapchainKHR
am:
c556562471
Change-Id: I6013e3910fce339b9c4fe3a1f1102a0041310c63
Jeff Sharkey [Thu, 15 Dec 2016 23:40:51 +0000 (23:40 +0000)]
Merge "Handle invalid shared GIDs." am:
788bdeae78 am:
477601a9ff
am:
4be16dccfe
Change-Id: I3f845cb228aa409709da1f8de0444c9843533c01
Jeff Sharkey [Thu, 15 Dec 2016 23:21:49 +0000 (23:21 +0000)]
Merge "Handle invalid shared GIDs." am:
788bdeae78
am:
477601a9ff
Change-Id: Id21818687508092e41a970b9cd18ddbe15b7d740
Daniel Koch [Tue, 13 Dec 2016 23:45:13 +0000 (18:45 -0500)]
libvulkan: add NULL check to DestroySwapchainKHR
vkDestroySwapchainKHR is required to silently ignore NULL handles
that are provided to it to destroy.
This adds an early return if swapchain_handle is NULL.
Test: dEQP-VK.wsi.android.swapchain.destroy.null_handle (VK 1.0.2 CTS)
Change-Id: Ic230f114a680210cb0e0de931b17e4d70fb27f44
(cherry picked from commit
d78c2e8a0807ff45db4cb643cc2ef38eafd22551)
Jeff Sharkey [Thu, 15 Dec 2016 22:07:13 +0000 (22:07 +0000)]
Merge "Handle invalid shared GIDs."
am:
788bdeae78
Change-Id: I48c3d8e584a30ed994920f57570344d7736ab183
Jeff Sharkey [Thu, 15 Dec 2016 21:59:08 +0000 (21:59 +0000)]
Merge "Handle invalid shared GIDs."
Jeff Sharkey [Thu, 15 Dec 2016 21:50:11 +0000 (14:50 -0700)]
Handle invalid shared GIDs.
Shared GIDs are only available inside a range from 50000-59999, so
system UIDs (outside the normal app range) don't have a valid GID to
use. The best we can do is skip the profile setup in those cases.
Test: builds
Bug:
27948817
Change-Id: I8c38a0e3631eafd07e96da3e37e641b3cce195a6
Daniel Koch [Thu, 15 Dec 2016 19:33:02 +0000 (19:33 +0000)]
Merge "libvulkan: add NULL check to DestroySwapchainKHR" am:
55e4f91258 am:
f9312a168a
am:
c148af227a
Change-Id: I87d57323ba48cc00d11b33069cf957c88c590aa6
Daniel Koch [Thu, 15 Dec 2016 19:25:06 +0000 (19:25 +0000)]
Merge "libvulkan: add NULL check to DestroySwapchainKHR" am:
55e4f91258
am:
f9312a168a
Change-Id: I03c4d3ddfe78db575bed967ce01d30c5225ec1c7
Daniel Koch [Thu, 15 Dec 2016 19:18:03 +0000 (19:18 +0000)]
Merge "libvulkan: add NULL check to DestroySwapchainKHR"
am:
55e4f91258
Change-Id: I07b33309ac91d75535e0916315e98d5a1319c9b8
OSDN Git Service
