OSDN Git Service
Colin Cross [Thu, 6 Oct 2016 00:26:47 +0000 (00:26 +0000)]
Fix constructor parameters shadowing member variables
am:
859dcdc983
Change-Id: I89d1d52301f31315df02f47abf826015dad58627
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:24:00 +0000 (23:24 +0000)]
Merge "Migrate khrplatform.h to ndk_headers." am:
a0d616be74 am:
fea2cbbe39 am:
939621c380
am:
353eeaa967
Change-Id: I73b638cf2a2ba1d1b847edb4888b9c1f4dfc047f
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
Treehugger Robot [Wed, 5 Oct 2016 23:11:53 +0000 (23:11 +0000)]
Merge "Migrate khrplatform.h to ndk_headers."
Dan Albert [Wed, 5 Oct 2016 00:49:33 +0000 (17:49 -0700)]
Migrate khrplatform.h to ndk_headers.
Test: make native
Bug: http://b/
30465923
Change-Id: Idaf0eb973b7569f92b1f1575869d13b8c5e706fd
Dan Albert [Wed, 5 Oct 2016 20:50:25 +0000 (20:50 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef am:
900da7b14a am:
93c91c81fd am:
75a118f9d1
am:
5c6771d620
Change-Id: I2ed4685cec36e32836e668b6a7fb68dc7b974fc6
Dan Albert [Wed, 5 Oct 2016 20:50:12 +0000 (20:50 +0000)]
Migrate libGLESv3 to ndk_library. am:
d7d8efa471 am:
0238c63510 am:
61b9688387
am:
3ac8c54d72
Change-Id: I4a7ac130333f4b10408441002ad6d1c70c9a7d34
Dan Albert [Wed, 5 Oct 2016 20:49:52 +0000 (20:49 +0000)]
Migrate libGLESv2 to ndk_library. am:
00500c798a am:
2cdf177bc1 am:
6e8eeea98f
am:
471271a211
Change-Id: I60f2934dcbf86807ce166b84e1e4a59bc173540d
Dan Albert [Wed, 5 Oct 2016 20:49:32 +0000 (20:49 +0000)]
Migrate libGLESv1_CM to ndk_library. am:
7facb1db6e am:
ebe4ea9e88 am:
ff88cbd859
am:
34c210e473
Change-Id: Ia0dc5c230f6f0deaabc8b0d68064d35a00a3614b
Dan Albert [Wed, 5 Oct 2016 20:42:50 +0000 (20:42 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef am:
900da7b14a am:
93c91c81fd
am:
75a118f9d1
Change-Id: Icc233e4c2b64497741b75502dc51497a23a1c51f
Dan Albert [Wed, 5 Oct 2016 20:42:41 +0000 (20:42 +0000)]
Migrate libGLESv3 to ndk_library. am:
d7d8efa471 am:
0238c63510
am:
61b9688387
Change-Id: I794fc4359c6eb0601dd765867ad1c42990351687
Dan Albert [Wed, 5 Oct 2016 20:42:30 +0000 (20:42 +0000)]
Migrate libGLESv2 to ndk_library. am:
00500c798a am:
2cdf177bc1
am:
6e8eeea98f
Change-Id: Ic208e02635970134d5911fdbbc422aaeef553a9b
Dan Albert [Wed, 5 Oct 2016 20:42:19 +0000 (20:42 +0000)]
Migrate libGLESv1_CM to ndk_library. am:
7facb1db6e am:
ebe4ea9e88
am:
ff88cbd859
Change-Id: Ibbfd1136fb1d53f83204e697c5c233d73b3a7bb8
Dan Albert [Wed, 5 Oct 2016 20:40:19 +0000 (20:40 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef am:
900da7b14a
am:
93c91c81fd
Change-Id: I4f4c9b668d019d8eae010b41755c8985b9c76b17
Dan Albert [Wed, 5 Oct 2016 20:40:09 +0000 (20:40 +0000)]
Migrate libGLESv3 to ndk_library. am:
d7d8efa471
am:
0238c63510
Change-Id: Ie8a699ed04e115de621f4b2d5ac5b904d39006bd
Dan Albert [Wed, 5 Oct 2016 20:39:59 +0000 (20:39 +0000)]
Migrate libGLESv2 to ndk_library. am:
00500c798a
am:
2cdf177bc1
Change-Id: Iff08c160dbe9f974672672ca453303aaac5487bc
Dan Albert [Wed, 5 Oct 2016 20:39:49 +0000 (20:39 +0000)]
Migrate libGLESv1_CM to ndk_library. am:
7facb1db6e
am:
ebe4ea9e88
Change-Id: I6639fc184bf99095a3bcb3d8b0e77d6a24d5b3b6
Dan Albert [Wed, 5 Oct 2016 20:37:09 +0000 (20:37 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
am:
900da7b14a
Change-Id: I8d50ffcdaff60b51a81c0648a0087d645e99ee1d
Dan Albert [Wed, 5 Oct 2016 20:37:08 +0000 (20:37 +0000)]
Migrate libGLESv3 to ndk_library.
am:
d7d8efa471
Change-Id: I86f06ebcaa1e2dd860d61ff9cd9b5503158735ba
Dan Albert [Wed, 5 Oct 2016 20:36:58 +0000 (20:36 +0000)]
Migrate libGLESv2 to ndk_library.
am:
00500c798a
Change-Id: I3031e4a938bbfbd97b51735707bf5fe0bc884b37
Dan Albert [Wed, 5 Oct 2016 20:36:49 +0000 (20:36 +0000)]
Migrate libGLESv1_CM to ndk_library.
am:
7facb1db6e
Change-Id: I777d5d8b08ff11491aabdb4166d7c0d38b09f20c
Treehugger Robot [Wed, 5 Oct 2016 20:31:38 +0000 (20:31 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
* changes:
Migrate libGLESv3 to ndk_library.
Migrate libGLESv2 to ndk_library.
Migrate libGLESv1_CM to ndk_library.
Colin Cross [Wed, 5 Oct 2016 19:05:35 +0000 (19:05 +0000)]
Merge "Fix anonymous struct and union warnings" am:
87e72cb237 am:
a3ac6c2b86 am:
86eff80c19
am:
ee45b938e8
Change-Id: I3580bd93dca6c863a11435c0fc4fa5bf25f51067
Colin Cross [Wed, 5 Oct 2016 19:02:12 +0000 (19:02 +0000)]
Merge "Fix anonymous struct and union warnings" am:
87e72cb237 am:
a3ac6c2b86
am:
86eff80c19
Change-Id: I6358d387eebddcd9238f250db7429f5846a2260a
Colin Cross [Wed, 5 Oct 2016 18:59:41 +0000 (18:59 +0000)]
Merge "Fix anonymous struct and union warnings" am:
87e72cb237
am:
a3ac6c2b86
Change-Id: Iecd9d1b0b6a22d48a1cac59e028f7d31b50a3e3e
Colin Cross [Wed, 5 Oct 2016 18:56:41 +0000 (18:56 +0000)]
Merge "Fix anonymous struct and union warnings"
am:
87e72cb237
Change-Id: I1ace0ad7d2f175b6d6cc42a0ce6845c76ba032b3
Treehugger Robot [Wed, 5 Oct 2016 18:52:25 +0000 (18:52 +0000)]
Merge "Fix anonymous struct and union warnings"
Dan Albert [Wed, 5 Oct 2016 18:42:04 +0000 (18:42 +0000)]
Merge "Migrate libEGL to ndk_library." am:
ce1bc304a2 am:
183edbb062 am:
62d80401f3
am:
2fa713c803
Change-Id: If5341614d2beda92ed4cc7e006dd0846be3c4122
Dan Albert [Wed, 5 Oct 2016 18:35:40 +0000 (18:35 +0000)]
Merge "Migrate libEGL to ndk_library." am:
ce1bc304a2 am:
183edbb062
am:
62d80401f3
Change-Id: Iba58208172ee35efd854d2fd629e40413063f28d
Dan Albert [Wed, 5 Oct 2016 18:33:11 +0000 (18:33 +0000)]
Merge "Migrate libEGL to ndk_library." am:
ce1bc304a2
am:
183edbb062
Change-Id: Iff01a29d4b03a45a5b28a6f98f93eb4af3e00ad7
Dan Albert [Wed, 5 Oct 2016 18:30:40 +0000 (18:30 +0000)]
Merge "Migrate libEGL to ndk_library."
am:
ce1bc304a2
Change-Id: If048759fd60754bd0c7df9c02f33f28a800eaace
Treehugger Robot [Wed, 5 Oct 2016 18:24:16 +0000 (18:24 +0000)]
Merge "Migrate libEGL to ndk_library."
Colin Cross [Sat, 1 Oct 2016 00:24:06 +0000 (17:24 -0700)]
Fix anonymous struct and union warnings
gui/BufferItem.h and android/sensor.h uses anymous structs and nested
anonymous unions, which are GNU extensions. sensor.h uses them as part
of its API, so disable the warnings in libgui, the only module that
tries to use it with -Weverything. BufferItem.h only uses the unioned
fields inside libgui, remove the union and do the 64-bit to 32-bit
slicing manually so libvulkan doesn't need the warnings disabled.
Bug:
31752268
Test: m -j
Change-Id: I92d59b1202f4d6e5419edaa6d27b6e1c50ac0042
TreeHugger Robot [Wed, 5 Oct 2016 06:09:22 +0000 (06:09 +0000)]
Merge "Moar tests for RunCommand:"
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv3 to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I6a2f4df7f409596f487879eb7d43a7774dced894
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv2 to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I62e108bdd27b6dc40fdf7ede7d579a286cbf3b9b
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv1_CM to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: Icd83a5ef5d6afcde9441f49de14a8e645d15da2f
Colin Cross [Tue, 4 Oct 2016 21:29:46 +0000 (21:29 +0000)]
Merge "Rename dump methods to dumpState" am:
c72b9a3ce4 am:
219df2fd5b am:
bb6d63ad52 -s ours
am:
bab60e2706 -s ours
Change-Id: I6e19272c6278ca3f66f1af4b0ca4e9b352ae6b91
Colin Cross [Tue, 4 Oct 2016 21:29:14 +0000 (21:29 +0000)]
Merge changes I2ce11db5,Idba8278b am:
dd3f863499 am:
198134666b am:
d45e51b815 -s ours
am:
7c765a2ba1 -s ours
Change-Id: I144d986ee665e790e4be6b5e4480654bf7767d5a
Colin Cross [Tue, 4 Oct 2016 21:29:01 +0000 (21:29 +0000)]
Fix logging implicit sign conversions am:
8bafabf1f6 am:
6b2749643f am:
33a6d87795 -s ours
am:
92234c57ad -s ours
Change-Id: I88d37604ad552f91181e867bf8cecb13e8e836d4
Colin Cross [Tue, 4 Oct 2016 21:28:45 +0000 (21:28 +0000)]
Fix libgui warnings am:
6c5a17dd26 am:
972cce4cb9 am:
af06c61e1b
am:
6247ea9e71 -s ours
Change-Id: If0b5c03d4036a7c1680f5e6b9d5ed7f4d9f53117
Dan Stoza [Tue, 4 Oct 2016 21:27:40 +0000 (21:27 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ... am:
2b23374b45 am:
ea8e8a2aa6 am:
9d9e611d89
am:
9d8a48e37a
Change-Id: I06c194da748e40199a5b538b87ccee54b3527426
Dan Stoza [Tue, 4 Oct 2016 21:27:27 +0000 (21:27 +0000)]
SF: Fix a couple of Layer ref count issues am:
de84eb6b82 am:
1ce7c1d3aa am:
6ce2ad4310
am:
1d97450370
Change-Id: I4e7b901bb79773afce7781d5f74bd93a333398e5
Dan Stoza [Tue, 4 Oct 2016 21:27:17 +0000 (21:27 +0000)]
Build SF executable with USE_HWC2 when needed am:
f9f7f6931f am:
58719ff766 am:
1802970525
am:
d41641ef59
Change-Id: If8e314fa99eeba5f72063db1cabc72598b6a8c9c
Dan Stoza [Tue, 4 Oct 2016 21:27:04 +0000 (21:27 +0000)]
HWC2: Clear transform for SolidColor layers am:
f1098abecf am:
21200d1887 am:
af63992893
am:
de0f2902bc
Change-Id: Ia2687a19456221c9f68adb88e4d0e2675dfe1f19
Dan Stoza [Tue, 4 Oct 2016 21:26:47 +0000 (21:26 +0000)]
HWC2: Use SolidColor composition for DimLayer am:
0183f7acac am:
b4365b8d0b am:
f12431879e -s ours
am:
199202be65
Change-Id: I1b46c02fa5621c6ddda713206b51ae21de8237ca
Dan Stoza [Tue, 4 Oct 2016 21:26:37 +0000 (21:26 +0000)]
HWC2: Kill logspam for non-HWC virtual displays am:
179533d107 am:
9853a795ab am:
860ff9c846
am:
e9a23ea018
Change-Id: I8f83ce11003cd878b8efe7259276e8ba4dff1c4e
Dan Stoza [Tue, 4 Oct 2016 21:26:27 +0000 (21:26 +0000)]
HWC2: Fix virtual displays am:
5450fe5268 am:
d6fb6ea07b am:
aa23ebe03e -s ours
am:
327490c8c8
Change-Id: I5a370186699fd7b800b3892d9a47f41e0447669c
Dan Stoza [Tue, 4 Oct 2016 21:26:17 +0000 (21:26 +0000)]
HWC2: Don't set null handle for client layers am:
6be002845f am:
0fac961a58 am:
64e18c2bfe -s ours
am:
aa51ef39c9
Change-Id: Ic6163f655443bf32173f043127b00f2d4ac3b603
Dan Stoza [Tue, 4 Oct 2016 21:26:08 +0000 (21:26 +0000)]
HWC2: Hook up to BoardConfig variable am:
8beb15f220 am:
608852e318 am:
607bb29a98
am:
4131cca88b
Change-Id: I44b1c16742abc57b815c4456ffecc487ae5d1b94
Dan Stoza [Tue, 4 Oct 2016 21:25:57 +0000 (21:25 +0000)]
HWC2: Skip validate/present if display is off am:
00ac359a3b am:
de79392408 am:
ebec74a215
am:
092e03be27
Change-Id: Ia90f061aafc0c93e160152776d7252d178c12aeb
Colin Cross [Tue, 4 Oct 2016 21:23:41 +0000 (21:23 +0000)]
Merge "Rename dump methods to dumpState" am:
c72b9a3ce4 am:
219df2fd5b
am:
bb6d63ad52 -s ours
Change-Id: Id9b5435b3e309206a6a924005be240986bc46663
Colin Cross [Tue, 4 Oct 2016 21:23:07 +0000 (21:23 +0000)]
Merge changes I2ce11db5,Idba8278b am:
dd3f863499 am:
198134666b
am:
d45e51b815 -s ours
Change-Id: I4f7e6dbcd4a1ab14ed0c6e7cb056a6a94175831e
Colin Cross [Tue, 4 Oct 2016 21:22:53 +0000 (21:22 +0000)]
Fix logging implicit sign conversions am:
8bafabf1f6 am:
6b2749643f
am:
33a6d87795 -s ours
Change-Id: Idb41fd375c17ff8125f3149ad7ec4802a76d3d58
Colin Cross [Tue, 4 Oct 2016 21:22:41 +0000 (21:22 +0000)]
Fix libgui warnings am:
6c5a17dd26 am:
972cce4cb9
am:
af06c61e1b
Change-Id: I191c8a14d54427215922427c4bb497bdb7c27dd9
Dan Stoza [Tue, 4 Oct 2016 21:21:37 +0000 (21:21 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ... am:
2b23374b45 am:
ea8e8a2aa6
am:
9d9e611d89
Change-Id: I4e20874d0096fc4a5bc526821191d8903acac563
Dan Stoza [Tue, 4 Oct 2016 21:21:27 +0000 (21:21 +0000)]
SF: Fix a couple of Layer ref count issues am:
de84eb6b82 am:
1ce7c1d3aa
am:
6ce2ad4310
Change-Id: I1eeff52d56054e0f5b6ee9eaa3b7b9abb99ad106
Dan Stoza [Tue, 4 Oct 2016 21:21:16 +0000 (21:21 +0000)]
Build SF executable with USE_HWC2 when needed am:
f9f7f6931f am:
58719ff766
am:
1802970525
Change-Id: I376f995fbe7c1aca83f9aeafe27fae34d832111e
Dan Stoza [Tue, 4 Oct 2016 21:21:01 +0000 (21:21 +0000)]
HWC2: Clear transform for SolidColor layers am:
f1098abecf am:
21200d1887
am:
af63992893
Change-Id: I091535d02569f81997924990bec1f9f592cf9fbb
Dan Stoza [Tue, 4 Oct 2016 21:20:47 +0000 (21:20 +0000)]
HWC2: Use SolidColor composition for DimLayer am:
0183f7acac am:
b4365b8d0b
am:
f12431879e -s ours
Change-Id: I34607a9ae18dcc713d3e7a43bee4ca23883faee2
Dan Stoza [Tue, 4 Oct 2016 21:20:37 +0000 (21:20 +0000)]
HWC2: Kill logspam for non-HWC virtual displays am:
179533d107 am:
9853a795ab
am:
860ff9c846
Change-Id: Ibc40214c27890b0224918449818b2195dff5de71
Dan Stoza [Tue, 4 Oct 2016 21:20:27 +0000 (21:20 +0000)]
HWC2: Fix virtual displays am:
5450fe5268 am:
d6fb6ea07b
am:
aa23ebe03e -s ours
Change-Id: I72c0ca4d6dff8e295eaeddc472cb3b3cc49b4498
Dan Stoza [Tue, 4 Oct 2016 21:20:16 +0000 (21:20 +0000)]
HWC2: Don't set null handle for client layers am:
6be002845f am:
0fac961a58
am:
64e18c2bfe -s ours
Change-Id: Ib001496809231f89c31a790617d4aa32e43b6825
Dan Stoza [Tue, 4 Oct 2016 21:20:05 +0000 (21:20 +0000)]
HWC2: Hook up to BoardConfig variable am:
8beb15f220 am:
608852e318
am:
607bb29a98
Change-Id: Ica9191d91e58f8526ddf0f7e245bab1ab0ebfefd
Dan Stoza [Tue, 4 Oct 2016 21:19:57 +0000 (21:19 +0000)]
HWC2: Skip validate/present if display is off am:
00ac359a3b am:
de79392408
am:
ebec74a215
Change-Id: Ic7168a2c94ec5c4d93e8b2507c0570d97434829f
Felipe Leme [Sat, 1 Oct 2016 00:38:57 +0000 (17:38 -0700)]
Moar tests for RunCommand:
- Command not found.
- Command returns non-0 status (and fixed return of RunCommand).
- Command times out.
- Command is killed.
- Command crashes.
- Command logs initial message.
BUG:
31807540
Test: mmm -j32 frameworks/native/cmds/dumpstate/ && adb push ${ANDROID_PRODUCT_OUT}/data/nativetest/dumpstate_test* /data/nativetest && adb shell /data/nativetest/dumpstate_test/dumpstate_test
Change-Id: I6459846791e45f4ebc4433b83feec81be4050167
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libEGL to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I154a95c6fde9c34d770b6fe65bfd71ac51e05574
Colin Cross [Mon, 3 Oct 2016 18:10:11 +0000 (18:10 +0000)]
Merge "Fix constructor parameters shadowing member variables"
Dimitry Ivanov [Mon, 3 Oct 2016 10:16:00 +0000 (10:16 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 1 Oct 2016 20:30:37 +0000 (13:30 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: Ib46726fe6b330375bc925f409dfe6b1ce4cfe599
Colin Cross [Sat, 1 Oct 2016 03:15:44 +0000 (03:15 +0000)]
Rename dump methods to dumpState
am:
dc782511dc
Change-Id: I9803c375b16a9564bd664eb70e83efccab4672e9
Colin Cross [Sat, 1 Oct 2016 03:15:20 +0000 (03:15 +0000)]
Fix logging implicit sign conversions
am:
6e7e2b44ef
Change-Id: I45daa0ed37856b39e2168859b2c5c93f05ad90fc
Colin Cross [Sat, 1 Oct 2016 03:15:07 +0000 (03:15 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
1d6c149d89 am:
8806e2a789 am:
132b7491bc
am:
64b463a69b
Change-Id: I85efdbc7a80f9851d67aa72142285b30ed7ace09
Erik Kline [Sat, 1 Oct 2016 03:14:52 +0000 (03:14 +0000)]
Merge "Add "ip xfrm policy" to dumpstate output" into nyc-mr1-dev am:
a4bb5c7173 am:
9b60d83c2c
am:
efca26a34d
Change-Id: Icc9cbe3a1ebcf23d5f6e61f52aacc3861802b621
Erik Kline [Sat, 1 Oct 2016 03:14:24 +0000 (03:14 +0000)]
Add "ip xfrm policy" to dumpstate output am:
53ca94ab34 am:
5159997ffa
am:
19d86fdcdc -s ours
Change-Id: Icc691b6504813d40ad15052cf759579a83690174
TreeHugger Robot [Sat, 1 Oct 2016 02:27:53 +0000 (02:27 +0000)]
Merge "Add "ip xfrm policy" to dumpstate output"
TreeHugger Robot [Sat, 1 Oct 2016 01:29:48 +0000 (01:29 +0000)]
Merge "Added initial tests for dumpstate."
Erik Kline [Wed, 28 Sep 2016 08:26:26 +0000 (17:26 +0900)]
Add "ip xfrm policy" to dumpstate output
Test: local build, treehugger
Bug:
30869013
Change-Id: I1f0e5d820f0153484c38ecb0f9c764fca02d786c
Colin Cross [Fri, 30 Sep 2016 23:46:46 +0000 (23:46 +0000)]
Merge "Rename dump methods to dumpState" am:
c72b9a3ce4
am:
219df2fd5b
Change-Id: I0597aa09cf66820708b125421e0814d1c1f6a4ac
Colin Cross [Fri, 30 Sep 2016 23:43:18 +0000 (23:43 +0000)]
Merge "Rename dump methods to dumpState"
am:
c72b9a3ce4
Change-Id: I41cc42a6838c6e42bf257d8304f99d5ca8d74ab0
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
Colin Cross [Fri, 30 Sep 2016 23:30:24 +0000 (23:30 +0000)]
Merge "Rename dump methods to dumpState"
Colin Cross [Tue, 27 Sep 2016 01:10:16 +0000 (18:10 -0700)]
Rename dump methods to dumpState
The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
(cherry picked from commit
3d1d280fa3cbc30700f728a4b13e5308315433d3)
Colin Cross [Fri, 30 Sep 2016 22:05:18 +0000 (22:05 +0000)]
Merge "Rename dump methods to dumpState"
Colin Cross [Fri, 30 Sep 2016 20:12:34 +0000 (20:12 +0000)]
Merge changes I2ce11db5,Idba8278b am:
dd3f863499
am:
198134666b
Change-Id: Ibe861546bc113889034ee9d0e37c4368e4e13eac
Colin Cross [Fri, 30 Sep 2016 20:12:26 +0000 (20:12 +0000)]
Fix logging implicit sign conversions am:
8bafabf1f6
am:
6b2749643f
Change-Id: I22582b46e7490c3a6aae4417628a2d585fd21460
Colin Cross [Fri, 30 Sep 2016 20:12:18 +0000 (20:12 +0000)]
Fix libgui warnings am:
6c5a17dd26
am:
972cce4cb9
Change-Id: I83e31cd57286bb8fc5a25f7a1f6d895176640a84
Colin Cross [Fri, 30 Sep 2016 20:09:27 +0000 (20:09 +0000)]
Merge changes I2ce11db5,Idba8278b
am:
dd3f863499
Change-Id: I811fb4b61aed0ee6324b48aff2a8b3dfa4581b86
Colin Cross [Fri, 30 Sep 2016 20:09:26 +0000 (20:09 +0000)]
Fix logging implicit sign conversions
am:
8bafabf1f6
Change-Id: I5bdd64dddd845b3ffc910bc2161363e27d4f83ba
Colin Cross [Fri, 30 Sep 2016 20:09:18 +0000 (20:09 +0000)]
Fix libgui warnings
am:
6c5a17dd26
Change-Id: I463a190d7830dbdc5817c753f57fa9b5cdecd404
Colin Cross [Tue, 27 Sep 2016 01:10:16 +0000 (18:10 -0700)]
Rename dump methods to dumpState
The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Merged-in: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
Change-Id: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
Colin Cross [Fri, 30 Sep 2016 19:56:38 +0000 (19:56 +0000)]
Merge changes I2ce11db5,Idba8278b
* changes:
Fix logging implicit sign conversions
Fix libgui warnings
Colin Cross [Tue, 27 Sep 2016 21:08:19 +0000 (14:08 -0700)]
Fix logging implicit sign conversions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I2ce11db524ee9d8f846fdf3ed6fb882d5ef57956
(cherry picked from commit
152c3b749a8ec634afc66dddef7d33130472aeb1)
Colin Cross [Fri, 30 Sep 2016 17:59:48 +0000 (17:59 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
1d6c149d89 am:
8806e2a789
am:
132b7491bc
Change-Id: Ibb73e33e1517a724dda605e5d38a57615e48c4e1
Dan Stoza [Fri, 30 Sep 2016 17:59:03 +0000 (17:59 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ... am:
2b23374b45
am:
ea8e8a2aa6
Change-Id: I9688b655a778ad5ea675af0286cc7050f7ccfb96
Dan Stoza [Fri, 30 Sep 2016 17:58:55 +0000 (17:58 +0000)]
SF: Fix a couple of Layer ref count issues am:
de84eb6b82
am:
1ce7c1d3aa
Change-Id: I2ff87a50409fcc244b2cb59286990f98affdedbc
Dan Stoza [Fri, 30 Sep 2016 17:58:45 +0000 (17:58 +0000)]
Build SF executable with USE_HWC2 when needed am:
f9f7f6931f
am:
58719ff766
Change-Id: I559a674184a0a08829b49dd90d85e75478385021
OSDN Git Service
