OSDN Git Service
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"
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
Ashutosh Joshi [Mon, 17 Oct 2016 17:31:03 +0000 (17:31 +0000)]
Merge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev
am:
0590c6d766
Change-Id: Ib3a0588a70f52ed7b8fb295d326086598d47bdc6
Ashutosh Joshi [Mon, 17 Oct 2016 17:31:02 +0000 (17:31 +0000)]
Add a feature to signal fitness quality heart rate monitors
am:
8aacbc3127
Change-Id: Ic40f7583a9326393a4e6114a9e4a1c0909b15587
Ashutosh Joshi [Mon, 17 Oct 2016 17:20:35 +0000 (17:20 +0000)]
Merge "Add a feature to signal fitness quality heart rate monitors" into cw-f-dev
Dan Willemsen [Sat, 15 Oct 2016 02:27:37 +0000 (02:27 +0000)]
Merge "Remove ASAN specialization" am:
0723ad3969
am:
01d6334398
Change-Id: I17ad31f5cc0fcca510c56bbabd63c32cbc448698
Dan Willemsen [Sat, 15 Oct 2016 02:23:06 +0000 (02:23 +0000)]
Merge "Remove ASAN specialization"
am:
0723ad3969
Change-Id: I05bca0d1e4c1709565a05f1997a883c173279a53
Treehugger Robot [Sat, 15 Oct 2016 02:17:24 +0000 (02:17 +0000)]
Merge "Remove ASAN specialization"
Dan Willemsen [Tue, 11 Oct 2016 22:59:04 +0000 (15:59 -0700)]
Remove ASAN specialization
The linker will rewrite library paths when running with asan, there's no
reason to do this manually:
10-11 23:26:33.971 8789 8789 E linker : linker_asan dlopen translating "/system/lib64/libEGL.so" -> "/data/lib64/libEGL.so"
10-11 23:26:34.061 8790 8790 E linker : linker_asan dlopen translating "/system/lib/libEGL.so" -> "/data/lib/libEGL.so"
Test: Boot SANITIZE_TARGET=address aosp_flounder-eng
Change-Id: I3eb9935603b267c2aefe09d4f24410cbd673feb6
Ashutosh Joshi [Thu, 6 Oct 2016 20:04:35 +0000 (13:04 -0700)]
Add a feature to signal fitness quality heart rate monitors
Adding a feature to signal the presence of a fitness quality heart
rate monitor on the device.
Change-Id: Iaf5f6a2dc1c76e7f4ce40612588c368bcfc0d29d
Dan Willemsen [Fri, 14 Oct 2016 20:38:00 +0000 (20:38 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable" am:
8a767feb14
am:
e932226e8d
Change-Id: Idd3ed3f98a486b761b188784c4478aefe9d03662
Dan Willemsen [Fri, 14 Oct 2016 20:34:31 +0000 (20:34 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable"
am:
8a767feb14
Change-Id: I08a68da026d9a0f36572059a7db1c5e99b988f8e
Treehugger Robot [Fri, 14 Oct 2016 19:26:15 +0000 (19:26 +0000)]
Merge "Hardcode EGL Cache size to something more reasonable"
Dan Willemsen [Tue, 11 Oct 2016 22:42:59 +0000 (15:42 -0700)]
Hardcode EGL Cache size to something more reasonable
Most of our devices are setting much larger values here than the
default, so instead of hoping every device sets the larger values, just
hardcode the cache size to the larger values.
This also reduces build-time configuration, so we can share the built
library between more devices.
Test: /data/nativetest*/EGL_test/EGL_test on aosp_flounder-eng
Change-Id: Id9b80cecff837cc35043ad3c3cf1d1c60595c237
Dan Willemsen [Thu, 13 Oct 2016 23:24:29 +0000 (23:24 +0000)]
Merge "Remove EGL Hibernation" am:
5e86147abc am:
eccef21647
am:
b814df602f -s ours
Change-Id: Ia78ea687494c2125f68ba85a76bfa02c4c1f5c34
Dan Willemsen [Thu, 13 Oct 2016 23:18:16 +0000 (23:18 +0000)]
Merge "Remove EGL Hibernation" am:
5e86147abc
am:
eccef21647
Change-Id: Iffa69ccfeb0b80fab8d5e92873099413f7c2b560
Dan Willemsen [Thu, 13 Oct 2016 23:15:46 +0000 (23:15 +0000)]
Merge "Remove EGL Hibernation"
am:
5e86147abc
Change-Id: I7afcd579a1ba81733540b280186bb7e3644b1816
Treehugger Robot [Thu, 13 Oct 2016 23:08:57 +0000 (23:08 +0000)]
Merge "Remove EGL Hibernation"
Dan Willemsen [Tue, 11 Oct 2016 19:46:38 +0000 (12:46 -0700)]
Remove EGL Hibernation
Test: Booted aosp_flounder-eng
Merged-In: I0068bbd0a274bd0db237c30d958ea75b6d8aaf11
Change-Id: I0068bbd0a274bd0db237c30d958ea75b6d8aaf11
TreeHugger Robot [Thu, 13 Oct 2016 18:09:05 +0000 (18:09 +0000)]
Merge "Remove EGL Hibernation" into nyc-mr1-dev-plus-aosp
Dan Stoza [Thu, 13 Oct 2016 16:21:26 +0000 (16:21 +0000)]
libui: Add hasSignaled() method to Fence
am:
5736f7dc15
Change-Id: I14519e0db9d203d88655906b84e5bac7310ca2df
Dan Willemsen [Tue, 11 Oct 2016 19:46:38 +0000 (12:46 -0700)]
Remove EGL Hibernation
Test: Booted aosp_flounder-eng
Change-Id: I0068bbd0a274bd0db237c30d958ea75b6d8aaf11
Wei Wang [Wed, 12 Oct 2016 20:57:02 +0000 (20:57 +0000)]
Merge "Move atrace init into on fs trigger" am:
8fee401726 am:
23c7fe7195
am:
7247edd7ad
Change-Id: I6a987ded104c4237b2a373e2686b2c2d1232d2ed
Wei Wang [Wed, 12 Oct 2016 20:56:50 +0000 (20:56 +0000)]
Move atrace init into on fs trigger am:
23d0302561 am:
53389b089c
am:
6a67872673
Change-Id: I9b0a0469d6308ef9ff6db68191d39644ec5f3382
Wei Wang [Wed, 12 Oct 2016 20:50:16 +0000 (20:50 +0000)]
Merge "Move atrace init into on fs trigger" am:
8fee401726
am:
23c7fe7195
Change-Id: I6f5871db3c55845f1eba18e5a7ab2be57332ce22
Wei Wang [Wed, 12 Oct 2016 20:50:05 +0000 (20:50 +0000)]
Move atrace init into on fs trigger am:
23d0302561
am:
53389b089c
Change-Id: Id29974c68fbe8225b24182dd7e8e910e1921b44a
Wei Wang [Wed, 12 Oct 2016 20:43:00 +0000 (20:43 +0000)]
Merge "Move atrace init into on fs trigger"
am:
8fee401726
Change-Id: I6541f1f27aeaa056ec3f5a24327d7fd051157023
Wei Wang [Wed, 12 Oct 2016 20:42:58 +0000 (20:42 +0000)]
Move atrace init into on fs trigger
am:
23d0302561
Change-Id: I91ef42cb258552d75115632ce5d2df509e2cf35d
Wei Wang [Wed, 12 Oct 2016 20:36:43 +0000 (20:36 +0000)]
Merge "Move atrace init into on fs trigger"
Dan Stoza [Wed, 12 Oct 2016 17:35:17 +0000 (10:35 -0700)]
libui: Add hasSignaled() method to Fence
Adds a hasSignaled() method to android::Fence. This will make it easier
to write client code that only cares whether a fence has signaled, and
allows such code to gain the performance benefits of wait(0) (which is
significantly faster than getSignalTime()) while still being obvious
about what it is trying to do.
Test: m
Change-Id: Ia28ce6cff3860a171254ea20a24f3f1bfbc67eb8
Wei Wang [Tue, 11 Oct 2016 22:26:06 +0000 (15:26 -0700)]
Move atrace init into on fs trigger
sysfs should be ready on ealier stage than boot
Bug:
32025203
Test: take systrace
Change-Id: Id73b6959f3075dc793d93551963193a211060da8
Wei Wang [Wed, 12 Oct 2016 01:11:50 +0000 (01:11 +0000)]
Move atrace init into on fs trigger am:
f920891b71
am:
dc34164cef
Change-Id: I30a5063ae24b21f38945b581d1bfbe67390667f6
Wei Wang [Wed, 12 Oct 2016 01:06:17 +0000 (01:06 +0000)]
Move atrace init into on fs trigger
am:
f920891b71
Change-Id: If6deb43479999924cfce63ca6b3994f9f7276c39
Elliott Hughes [Wed, 12 Oct 2016 00:55:06 +0000 (00:55 +0000)]
Merge "Rely on the platform -std default." am:
26989871a5 am:
35368f2475
am:
274347ebf1
Change-Id: Idce8ffa834e8ae8298d3ab8f516b4f4f31b02f18
Elliott Hughes [Wed, 12 Oct 2016 00:48:50 +0000 (00:48 +0000)]
Merge "Rely on the platform -std default." am:
26989871a5
am:
35368f2475
Change-Id: I1dffb52b3f59a8fe42c4c42e10ff7c9287e81e63
Elliott Hughes [Wed, 12 Oct 2016 00:42:19 +0000 (00:42 +0000)]
Merge "Rely on the platform -std default."
am:
26989871a5
Change-Id: I1acbc09058a339d0df076e0fccb750bb57099e8d
Treehugger Robot [Wed, 12 Oct 2016 00:32:21 +0000 (00:32 +0000)]
Merge "Rely on the platform -std default."
Wei Wang [Tue, 11 Oct 2016 22:26:06 +0000 (15:26 -0700)]
Move atrace init into on fs trigger
sysfs should be ready on ealier stage than boot
Bug:
32025203
Test: take systrace
Change-Id: Id73b6959f3075dc793d93551963193a211060da8
Elliott Hughes [Tue, 11 Oct 2016 21:47:19 +0000 (14:47 -0700)]
Rely on the platform -std default.
Bug: http://b/
32019064
Test: builds
Change-Id: I88ea6b959b9d855a536e1475ed437105370203d0
Elliott Hughes [Mon, 10 Oct 2016 22:33:21 +0000 (22:33 +0000)]
Merge "Rely on the platform -std default." am:
53b6fc5ddc am:
0ef01bab39
am:
b48bc88b75
Change-Id: I948f14c73030d6d0f0cae8b9e374962ad119f7f6
Elliott Hughes [Mon, 10 Oct 2016 22:00:57 +0000 (22:00 +0000)]
Merge "Rely on the platform -std default." am:
53b6fc5ddc
am:
0ef01bab39
Change-Id: I11137b0f1327691fa88acee67d9270fe509aa353
Elliott Hughes [Mon, 10 Oct 2016 21:46:02 +0000 (21:46 +0000)]
Merge "Rely on the platform -std default."
am:
53b6fc5ddc
Change-Id: Ie70a8414a18c0f8b8bb4054545bc7dc74c99838c
Treehugger Robot [Mon, 10 Oct 2016 21:19:54 +0000 (21:19 +0000)]
Merge "Rely on the platform -std default."
Matthew Bouyack [Mon, 10 Oct 2016 18:11:34 +0000 (18:11 +0000)]
Merge "Use snprintf for SurfaceFlinger fence name" into cw-f-dev
am:
f35d95673e
Change-Id: I014bbfa36ee2f660309d8bb10e6be989189e6de1
Matthew Bouyack [Mon, 10 Oct 2016 18:11:30 +0000 (18:11 +0000)]
Use snprintf for SurfaceFlinger fence name
am:
fd4c8c3805
Change-Id: I16d3eb7cde318f2078be36acea22b9bc84975b63
Matthew Bouyack [Mon, 10 Oct 2016 18:03:37 +0000 (18:03 +0000)]
Merge "Use snprintf for SurfaceFlinger fence name" into cw-f-dev
Matthew Bouyack [Fri, 7 Oct 2016 21:26:47 +0000 (14:26 -0700)]
Use snprintf for SurfaceFlinger fence name
snprintf is significantly faster than String8::format
This change saves ~50us per frame on Android Wear
Change-Id: I6ac47c2434662ca561208daae232f02a9f136aaf
Elliott Hughes [Fri, 7 Oct 2016 22:46:42 +0000 (15:46 -0700)]
Rely on the platform -std default.
Bug: http://b/
32019064
Test: builds
Change-Id: Ie2df259641889b3ce95648bd2be48d061108162c
Matthew Bouyack [Fri, 7 Oct 2016 16:54:57 +0000 (16:54 +0000)]
Merge "Eliminate unnecessary calls to onBufferReleased" into cw-f-dev
am:
76456aa438
Change-Id: I9ee9b9146397c46b98c9bf736a10b0e343c4e836
Matthew Bouyack [Thu, 6 Oct 2016 22:36:56 +0000 (15:36 -0700)]
resolve merge conflicts of
3b8e6b2 to nyc-mr1-dev-plus-aosp
Change-Id: I9c02a56d63de5828453aa8926ca801d96b04a6cf
Matthew Bouyack [Thu, 6 Oct 2016 21:27:20 +0000 (21:27 +0000)]
Merge "Eliminate unnecessary calls to onBufferReleased" into cw-f-dev
Wei Liu [Thu, 6 Oct 2016 21:25:23 +0000 (21:25 +0000)]
Dumpstate should hold a wakelock to save bug report time. DO NOT MERGE. am:
2cc37eaaa7
am:
079abd98af
Change-Id: I36189431935344400deea32596c030dae8b4a82b
Wei Liu [Thu, 6 Oct 2016 19:54:04 +0000 (19:54 +0000)]
Dumpstate should hold a wakelock to save bug report time. DO NOT MERGE.
am:
2cc37eaaa7
Change-Id: Ic58338aaf3dd67b9256e42fe4d61416b35c367de
Dan Albert [Thu, 6 Oct 2016 19:27:13 +0000 (19:27 +0000)]
Merge "Migrate libvulkan to ndk_library." am:
02affcd552 am:
425ae4a06a
am:
38bfdb02db
Change-Id: Ib499b72acfc947cd27e084c2cdc7c6b52b1ea07e
Dan Albert [Thu, 6 Oct 2016 19:23:43 +0000 (19:23 +0000)]
Merge "Migrate libvulkan to ndk_library." am:
02affcd552
am:
425ae4a06a
Change-Id: Ie771d411939c583dd30dd1b753d9dfdf28f2fd74
Dan Albert [Thu, 6 Oct 2016 19:20:13 +0000 (19:20 +0000)]
Merge "Migrate libvulkan to ndk_library."
am:
02affcd552
Change-Id: I97d6f3e7ce8058c190ac38ad9214794ccea6def3
Treehugger Robot [Thu, 6 Oct 2016 19:14:10 +0000 (19:14 +0000)]
Merge "Migrate libvulkan to ndk_library."
Dan Albert [Wed, 5 Oct 2016 00:49:33 +0000 (17:49 -0700)]
Migrate libvulkan to ndk_library.
Test: make native
Bug: http://b/
30465923
Change-Id: I97199a600b71447fd14181e06be3f9221c2529f3
Colin Cross [Fri, 30 Sep 2016 23:32:19 +0000 (16:32 -0700)]
Fix constructor parameters shadowing member variables
Using the same name for the constructor parameter and the member
variable causes a warning that was being hidden by the use of -isystem
to include frameworks/native/include. Prefix the parameter with an
underscore.
Bug:
31752268
Test: m -j
Change-Id: I60c7dc388999bafbb97cb42f5e0af5361df68d56
(cherry picked from commit
0ed088bd90c4e9ae5a92047319c3932b2aa78ddf)
Dan Albert [Wed, 5 Oct 2016 23:20:59 +0000 (23:20 +0000)]
Merge "Migrate khrplatform.h to ndk_headers." am:
a0d616be74 am:
fea2cbbe39
am:
939621c380
Change-Id: Ic06b577feeac9a6419b03644cd529886e0330978
Dan Albert [Wed, 5 Oct 2016 23:18:28 +0000 (23:18 +0000)]
Merge "Migrate khrplatform.h to ndk_headers." am:
a0d616be74
am:
fea2cbbe39
Change-Id: If4cfe4aa468e50dd12c8f0c66bdfdbca8e0bf8f5
Dan Albert [Wed, 5 Oct 2016 23:15:59 +0000 (23:15 +0000)]
Merge "Migrate khrplatform.h to ndk_headers."
am:
a0d616be74
Change-Id: I659219ee179aac1d43e74dcdecde46c073c89436
OSDN Git Service
