OSDN Git Service
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 [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
Colin Cross [Fri, 30 Sep 2016 17:48:56 +0000 (17:48 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
1d6c149d89
am:
8806e2a789
Change-Id: Ib37b329e85dd3f72953b4f9b4eada5733976bead
Colin Cross [Fri, 30 Sep 2016 17:40:35 +0000 (17:40 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
1d6c149d89
Change-Id: Iba83f822a72416e0b63b796f16065e8a672d66d9
Colin Cross [Fri, 30 Sep 2016 17:33:29 +0000 (17:33 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Erik Kline [Fri, 30 Sep 2016 17:07:15 +0000 (17:07 +0000)]
Merge "Add "ip xfrm policy" to dumpstate output" into nyc-mr1-dev am:
a4bb5c7173
am:
9b60d83c2c
Change-Id: I52f750d205ba0671d43553baee040dd3af8bf1c8
Erik Kline [Fri, 30 Sep 2016 17:07:03 +0000 (17:07 +0000)]
Add "ip xfrm policy" to dumpstate output am:
53ca94ab34
am:
5159997ffa
Change-Id: I01a70f51e5c8df9d8421381f58246d49e69e8c52
Erik Kline [Fri, 30 Sep 2016 17:04:03 +0000 (17:04 +0000)]
Merge "Add "ip xfrm policy" to dumpstate output" into nyc-mr1-dev
am:
a4bb5c7173
Change-Id: Iad51735819ce9e2d57072e657aa99d471b5baedc
Erik Kline [Fri, 30 Sep 2016 17:04:02 +0000 (17:04 +0000)]
Add "ip xfrm policy" to dumpstate output
am:
53ca94ab34
Change-Id: I0b7b5f39acd68f0e176b4c684c108c7d906e5515
TreeHugger Robot [Fri, 30 Sep 2016 17:00:16 +0000 (17:00 +0000)]
Merge "Add "ip xfrm policy" to dumpstate output" into nyc-mr1-dev
Colin Cross [Fri, 30 Sep 2016 00:46:51 +0000 (17:46 -0700)]
Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I46208cec43599f775f7e2cb22b39d19b0ea762e1
Colin Cross [Thu, 29 Sep 2016 23:56:43 +0000 (23:56 +0000)]
Merge "Fix weak vtable warnings" am:
d93a40c920 am:
11a2bcad06
am:
cd77a5a218
Change-Id: Id487011570e506e49a23a793b13e3a173c618a4c
Colin Cross [Thu, 29 Sep 2016 23:56:32 +0000 (23:56 +0000)]
Merge "Rewrite multicharacter constant using constexpr" am:
991667ba8c am:
3f6292ea81
am:
2ef0bdafc1
Change-Id: Ib0fb4e1d2ab3203ba0e21b3a71de12d5176613cb
Colin Cross [Thu, 29 Sep 2016 23:56:20 +0000 (23:56 +0000)]
Merge "Fix rule of three warnings" am:
dfd195160a am:
52b3fe2fcc
am:
71b953d0a3
Change-Id: I7a18515d52e3137b3fef304f6c69a6c2a7c64264
Colin Cross [Thu, 29 Sep 2016 23:56:08 +0000 (23:56 +0000)]
Merge "Fix implicit sign casts in Parcel.h" am:
9984fa0ed0 am:
4901e7c070
am:
7600934e17
Change-Id: I40be1101c9bd1cb77571e1c26ac8000e96293232
Colin Cross [Thu, 29 Sep 2016 23:46:41 +0000 (23:46 +0000)]
Merge "Fix weak vtable warnings" am:
d93a40c920
am:
11a2bcad06
Change-Id: I1fd134d6eedb2f324de36b8e066b7d942fccd2eb
Colin Cross [Thu, 29 Sep 2016 23:46:31 +0000 (23:46 +0000)]
Merge "Rewrite multicharacter constant using constexpr" am:
991667ba8c
am:
3f6292ea81
Change-Id: I8ccf4b34cb9dc76c91ceac5f928918fa2e0b7ec0
Colin Cross [Thu, 29 Sep 2016 23:46:20 +0000 (23:46 +0000)]
Merge "Fix rule of three warnings" am:
dfd195160a
am:
52b3fe2fcc
Change-Id: I9737cdfceb1ba74211efc3fb7fb4d8657578cd25
Colin Cross [Thu, 29 Sep 2016 23:44:40 +0000 (23:44 +0000)]
Merge "Fix weak vtable warnings"
am:
d93a40c920
Change-Id: I54d2cad55131ac3a8786012d692d4627f188a0a7
Colin Cross [Thu, 29 Sep 2016 23:44:30 +0000 (23:44 +0000)]
Merge "Rewrite multicharacter constant using constexpr"
am:
991667ba8c
Change-Id: Iecaee1af6b787187f971e57d8ca3d4d223c79627
Colin Cross [Thu, 29 Sep 2016 23:44:19 +0000 (23:44 +0000)]
Merge "Fix rule of three warnings"
am:
dfd195160a
Change-Id: Ifcc0ef0c71f465ada5c62cbcccd40580df802a51
Andreas Gampe [Thu, 29 Sep 2016 23:39:20 +0000 (23:39 +0000)]
Merge "Installd: Add a delete_odex command" am:
d6df7e33ad am:
a0c21336ab
am:
ab5550ce1b
Change-Id: I7e11ae9a4b601a9540a2dfc43aa27a324a732797
Colin Cross [Thu, 29 Sep 2016 23:36:22 +0000 (23:36 +0000)]
Merge "Fix weak vtable warnings"
Colin Cross [Mon, 26 Sep 2016 20:48:02 +0000 (13:48 -0700)]
Fix weak vtable warnings
Move virtual destructors into cpp file so that the compiler knows which
translation unit to put the vtable into. Hide the warning for
DeathRecipient, which has no virtual methods to move. The warnings were
being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I25329d66bfc1f6a5064d05ce7d12ad9b090601f8
Colin Cross [Thu, 29 Sep 2016 23:35:54 +0000 (23:35 +0000)]
Merge "Rewrite multicharacter constant using constexpr"
Colin Cross [Tue, 27 Sep 2016 01:11:51 +0000 (18:11 -0700)]
Rewrite multicharacter constant using constexpr
Multi character constants are implementation defined behavior, use a
constexpr instead. The warnings were being hidden by the use of
-isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I22435d1f66a073c303202da7a1940cb14b0b9fd8
Colin Cross [Thu, 29 Sep 2016 23:35:27 +0000 (23:35 +0000)]
Merge "Fix rule of three warnings"
Colin Cross [Tue, 27 Sep 2016 01:11:41 +0000 (18:11 -0700)]
Fix rule of three warnings
Sensor and BufferItem have destructors, the copy constructor and
assignment operators should not be implicit. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: If375d85cd3d6ded4ee6b27b841bf10f563254682
Colin Cross [Thu, 29 Sep 2016 17:42:03 +0000 (17:42 +0000)]
Merge "Fix implicit sign casts in Parcel.h" am:
9984fa0ed0
am:
4901e7c070
Change-Id: Ic291dbf2eb8d6244b883c696756183ace21cfa46
Colin Cross [Thu, 29 Sep 2016 17:32:11 +0000 (17:32 +0000)]
Merge "Fix implicit sign casts in Parcel.h"
am:
9984fa0ed0
Change-Id: I7a5fb0652ccfd88094ceb2e48a8ff2291166f7f7
Colin Cross [Thu, 29 Sep 2016 17:20:07 +0000 (17:20 +0000)]
Merge "Fix implicit sign casts in Parcel.h"
Colin Cross [Tue, 27 Sep 2016 20:58:30 +0000 (13:58 -0700)]
Fix implicit sign casts in Parcel.h
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I20d9a5712c77894f9048ef78264d7dc9f59208ea
Andreas Gampe [Thu, 29 Sep 2016 00:34:04 +0000 (00:34 +0000)]
Merge "Installd: Add a delete_odex command" am:
d6df7e33ad
am:
a0c21336ab
Change-Id: Ia246906318cdee0c4653c75e79ecf188bb572ca2
Andreas Gampe [Thu, 29 Sep 2016 00:20:22 +0000 (00:20 +0000)]
Merge "Installd: Add a delete_odex command"
am:
d6df7e33ad
Change-Id: Ife9a2c8c7ee8339dc4e416a397519590fca2cdf6
Treehugger Robot [Thu, 29 Sep 2016 00:00:49 +0000 (00:00 +0000)]
Merge "Installd: Add a delete_odex command"
Colin Cross [Wed, 28 Sep 2016 23:27:30 +0000 (23:27 +0000)]
Merge "Fix libinput warnings" am:
a4767442e3 am:
a149886878
am:
35d869c15e
Change-Id: I6461ef056bf41d66d391f52cfb25a680dd61b14e
Colin Cross [Wed, 28 Sep 2016 23:24:59 +0000 (23:24 +0000)]
Merge "Fix libinput warnings" am:
a4767442e3
am:
a149886878
Change-Id: Ie7aaee558da27d52cc20574dfea4eb61f68c2901
Colin Cross [Wed, 28 Sep 2016 23:21:31 +0000 (23:21 +0000)]
Merge "Fix libinput warnings"
am:
a4767442e3
Change-Id: I2bf4442e4785a3a15331d7c0482925326a9f38c4
Colin Cross [Wed, 28 Sep 2016 23:13:54 +0000 (23:13 +0000)]
Merge "Fix libinput warnings"
Colin Cross [Tue, 27 Sep 2016 21:12:09 +0000 (14:12 -0700)]
Fix libinput warnings
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I13f03892c75ea3c3139ca676666b0d403871d241
Chih-hung Hsieh [Wed, 28 Sep 2016 23:10:07 +0000 (23:10 +0000)]
Merge "Fix google-explicit-constructor warnings in HardwareAPI." am:
c8de4a06ab am:
9285335221
am:
64e47fabae
Change-Id: Ia27b9704d92149284e010a85b95e3bb8fbae6e51
Chih-hung Hsieh [Wed, 28 Sep 2016 23:09:52 +0000 (23:09 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui." am:
170454b0fa am:
5a283bbd40
am:
e7f4cb46c4
Change-Id: I46d36b040e143dd5eedae7597ec7875ab920ac7b
Chih-Hung Hsieh [Wed, 28 Sep 2016 23:09:39 +0000 (23:09 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl." am:
9ccba3c090 am:
512fb374d2
am:
ba50990a04
Change-Id: I2ed99ac20752b794149b1e5a6b3b6403210034c5
Chih-hung Hsieh [Wed, 28 Sep 2016 23:07:38 +0000 (23:07 +0000)]
Merge "Fix google-explicit-constructor warnings in HardwareAPI." am:
c8de4a06ab
am:
9285335221
Change-Id: I33c5d3fdfa292b9593c0f38bba5bf24294544626
Chih-hung Hsieh [Wed, 28 Sep 2016 23:07:24 +0000 (23:07 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui." am:
170454b0fa
am:
5a283bbd40
Change-Id: I0eb6f2ed5005ce4cc7d2fa63172c28822b3b4985
Chih-Hung Hsieh [Wed, 28 Sep 2016 23:07:08 +0000 (23:07 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl." am:
9ccba3c090
am:
512fb374d2
Change-Id: I1c62a8127f407eb8d675f40681acf42e7850ee57
Jesse Hall [Wed, 28 Sep 2016 23:04:08 +0000 (23:04 +0000)]
EGL: check that display is still valid am:
d6e9946cdd
am:
3169437feb
Change-Id: If2a509e29d5a8cbc06687469279523e5c07fd197
Chih-hung Hsieh [Wed, 28 Sep 2016 23:02:33 +0000 (23:02 +0000)]
Merge "Fix google-explicit-constructor warnings in HardwareAPI."
am:
c8de4a06ab
Change-Id: Ic8d39038699dd9bfa56bbdeb6f29293bad47d4f5
Chih-hung Hsieh [Wed, 28 Sep 2016 23:02:20 +0000 (23:02 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui."
am:
170454b0fa
Change-Id: I1b95e35d622827f27b1637af00e312c055fd2c27
Chih-Hung Hsieh [Wed, 28 Sep 2016 23:02:07 +0000 (23:02 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl."
am:
9ccba3c090
Change-Id: Icf73c478090ef837c24aa3b4b75152ad4eef3480
Jesse Hall [Wed, 28 Sep 2016 23:01:38 +0000 (23:01 +0000)]
EGL: check that display is still valid
am:
d6e9946cdd
Change-Id: I6d5f5e6f4790f16c1bd52f96743c7e138973a1b4
Chih-hung Hsieh [Wed, 28 Sep 2016 22:55:30 +0000 (22:55 +0000)]
Merge "Fix google-explicit-constructor warnings in HardwareAPI."
Chih-hung Hsieh [Wed, 28 Sep 2016 22:55:23 +0000 (22:55 +0000)]
Merge "Fix google-explicit-constructor warnings in gui and ui."
Treehugger Robot [Wed, 28 Sep 2016 22:55:16 +0000 (22:55 +0000)]
Merge "Fix google-explicit-constructor warnings in opengl."
Jesse Hall [Wed, 28 Sep 2016 18:26:57 +0000 (11:26 -0700)]
EGL: check that display is still valid
Bug:
31522731
Change-Id: I84d82e55aba5b58dfdbcac9e208c36767fbedfd1
Colin Cross [Wed, 28 Sep 2016 21:11:42 +0000 (21:11 +0000)]
Merge "Fix order of operations warning in libui" am:
73d4186757 am:
1b080b15aa
am:
544c391292
Change-Id: I8fbce66a7a5f41281fa12ce34869f2a1b5e10413
Colin Cross [Wed, 28 Sep 2016 21:11:28 +0000 (21:11 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8cdcd15c38 am:
5c9421500e
am:
ef2e1afdc2
Change-Id: I1656836e48b6092602c0a4bf8135084fe8da7df5
Colin Cross [Wed, 28 Sep 2016 21:04:31 +0000 (21:04 +0000)]
Merge "Fix order of operations warning in libui" am:
73d4186757
am:
1b080b15aa
Change-Id: I959d837f06cfbc747261b92d7202b953ee2e15f1
Colin Cross [Wed, 28 Sep 2016 21:02:00 +0000 (21:02 +0000)]
Merge "Fix order of operations warning in libui"
am:
73d4186757
Change-Id: Ib93a8ddcb912b05cd38db1dea7ac0ff21a788bcd
Colin Cross [Wed, 28 Sep 2016 21:02:00 +0000 (21:02 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8cdcd15c38
am:
5c9421500e
Change-Id: I9f971b18ff7fa72241eb860a782c9a585f8e56f8
Colin Cross [Wed, 28 Sep 2016 20:59:31 +0000 (20:59 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
8cdcd15c38
Change-Id: If6768b8a9468833f0fec5025f95c1796dc2869ca
Andreas Gampe [Sat, 10 Sep 2016 00:07:04 +0000 (17:07 -0700)]
Installd: Add a delete_odex command
Add a command to delete odex files.
Bug:
31347757
Change-Id: I29bca8751bcee8d6981c682fbbc816c73b78ac68
(cherry picked from commit
3964da0636624ff9af42d1f316bed0752e37c490)
Colin Cross [Wed, 28 Sep 2016 20:57:56 +0000 (20:57 +0000)]
Merge "Fix order of operations warning in libui"
Colin Cross [Tue, 27 Sep 2016 21:09:07 +0000 (14:09 -0700)]
Fix order of operations warning in libui
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I21f34567927125d3eeeecd8f00271a175f93af21
Colin Cross [Wed, 28 Sep 2016 20:53:15 +0000 (20:53 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Dimitry Ivanov [Wed, 28 Sep 2016 19:07:22 +0000 (19:07 +0000)]
Merge "Add missing liblog dependency" am:
c4dd0c3b83 am:
abd9a76f5e
am:
924fd128fc
Change-Id: I4ec9bf4e9842e9ca9353532e93b322991db685ca
Dimitry Ivanov [Wed, 28 Sep 2016 19:04:22 +0000 (19:04 +0000)]
Merge "Add missing liblog dependency" am:
c4dd0c3b83
am:
abd9a76f5e
Change-Id: Iff76ef4ef129b4e1e76786998a0cbf9acec08f3b
Dimitry Ivanov [Wed, 28 Sep 2016 19:01:21 +0000 (19:01 +0000)]
Merge "Add missing liblog dependency"
am:
c4dd0c3b83
Change-Id: I710f932670b8374e11a19fe96f2a53b622753468
Dimitry Ivanov [Wed, 28 Sep 2016 18:56:35 +0000 (18:56 +0000)]
Merge "Add missing liblog dependency"
Colin Cross [Mon, 26 Sep 2016 20:48:25 +0000 (13:48 -0700)]
Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: If2bae8b2fbc4238d6251cdd78bc7b5216684f99d
Erik Kline [Wed, 28 Sep 2016 08:26:26 +0000 (17:26 +0900)]
Add "ip xfrm policy" to dumpstate output
Bug:
30869013
Change-Id: I1f0e5d820f0153484c38ecb0f9c764fca02d786c
Dan Albert [Wed, 28 Sep 2016 08:59:43 +0000 (08:59 +0000)]
Merge "Include what we use." am:
be7fdfc2a1 am:
7e46950b9e
am:
2e9f5e36b5
Change-Id: I4b8f70dc86df8eeefb4a246084a87d50500e7632
Dan Albert [Wed, 28 Sep 2016 08:57:12 +0000 (08:57 +0000)]
Merge "Include what we use." am:
be7fdfc2a1
am:
7e46950b9e
Change-Id: I898b65a7aafd46fe04dff729307c8a7532053f0c
Dan Albert [Wed, 28 Sep 2016 08:54:12 +0000 (08:54 +0000)]
Merge "Include what we use."
am:
be7fdfc2a1
Change-Id: Ifb6f3d6424dc3f1295a8c50a8773b58410b562d9
Treehugger Robot [Wed, 28 Sep 2016 08:50:27 +0000 (08:50 +0000)]
Merge "Include what we use."
Dan Albert [Wed, 28 Sep 2016 07:03:56 +0000 (00:03 -0700)]
Include what we use.
Test: make checkbuild
Bug: None
Change-Id: If803e761c6d7e0c6d043bbcd2ace47f373495db3
Colin Cross [Wed, 28 Sep 2016 04:04:18 +0000 (04:04 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f am:
132fb22957 am:
ab6e9c8664
am:
0c4994a522
Change-Id: I41d47cf42faa75a2ca48397646be110d141bbdd2
Colin Cross [Wed, 28 Sep 2016 04:04:10 +0000 (04:04 +0000)]
Fix constructor parameters shadowing member variables am:
382ecd3d63 am:
6c79fc7bec
am:
177b452c8c
Change-Id: I1798f49b90a0431c84711c531706e96783fa6802
Colin Cross [Wed, 28 Sep 2016 04:04:02 +0000 (04:04 +0000)]
Use uint32_t consistently for region op am:
8f279960c6 am:
19bf9a2f27
am:
66b52bae7a
Change-Id: Ic88d190dd73525e901279bdf80897bd0cace004f
Colin Cross [Wed, 28 Sep 2016 04:03:54 +0000 (04:03 +0000)]
Fix trailing semicolon warnings am:
17576de056 am:
170ae8a510
am:
df1b5a19fd
Change-Id: I1beb53002656be0ca988c18108d5e9a565a1f707
Colin Cross [Wed, 28 Sep 2016 03:58:45 +0000 (03:58 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f am:
132fb22957
am:
ab6e9c8664
Change-Id: I6e45359233ab789375c4493f06135e16a3934299
Colin Cross [Wed, 28 Sep 2016 03:58:38 +0000 (03:58 +0000)]
Fix constructor parameters shadowing member variables am:
382ecd3d63
am:
6c79fc7bec
Change-Id: I5bf56d1691c20cd7830f309e88f13064837c7ccf
Colin Cross [Wed, 28 Sep 2016 03:58:31 +0000 (03:58 +0000)]
Use uint32_t consistently for region op am:
8f279960c6
am:
19bf9a2f27
Change-Id: Ia4ed908c51a32ed3ad255b244609983399b7cc44
Colin Cross [Wed, 28 Sep 2016 03:58:23 +0000 (03:58 +0000)]
Fix trailing semicolon warnings am:
17576de056
am:
170ae8a510
Change-Id: Iad76ba1b19d0e74f98ac217d40fbc1afd09a014d
Dan Albert [Wed, 28 Sep 2016 03:52:10 +0000 (03:52 +0000)]
Merge "Migrate libandroid headers to ndk_headers." am:
fd9d1fb52b am:
c356d61d00
am:
010e7af396
Change-Id: Iff50ea1ca85b1702881203a51f14a0bff09ab2e3
Colin Cross [Wed, 28 Sep 2016 03:51:56 +0000 (03:51 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f
am:
132fb22957
Change-Id: Idb0a92939564554becffe4cfa7209f9c220176e6
Colin Cross [Wed, 28 Sep 2016 03:51:55 +0000 (03:51 +0000)]
Fix constructor parameters shadowing member variables
am:
382ecd3d63
Change-Id: I89fc7c1780eab42ab17e028997db2d125f59c2d8
Colin Cross [Wed, 28 Sep 2016 03:51:37 +0000 (03:51 +0000)]
Use uint32_t consistently for region op
am:
8f279960c6
Change-Id: Ibe726f674fc22ca69cd33242ff0059ac6dd70c48
Colin Cross [Wed, 28 Sep 2016 03:51:27 +0000 (03:51 +0000)]
Fix trailing semicolon warnings
am:
17576de056
Change-Id: I6bb34741553c12225d62fd4fdcde74e14502a15c
Dan Albert [Wed, 28 Sep 2016 03:43:03 +0000 (03:43 +0000)]
Merge "Migrate libandroid headers to ndk_headers." am:
fd9d1fb52b
am:
c356d61d00
Change-Id: I39d19a30d34b2c2f13a0be9609972e332a86c014
Colin Cross [Wed, 28 Sep 2016 03:37:50 +0000 (03:37 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f
* changes:
Fix constructor parameters shadowing member variables
Use uint32_t consistently for region op
Fix trailing semicolon warnings
Dan Albert [Wed, 28 Sep 2016 03:37:33 +0000 (03:37 +0000)]
Merge "Migrate libandroid headers to ndk_headers."
am:
fd9d1fb52b
Change-Id: I3762d8549bc449283c874f420d0fa72bda40f244
Peng Xu [Wed, 28 Sep 2016 03:36:53 +0000 (03:36 +0000)]
Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
am:
0627130b28
Change-Id: Ifa7a7da62d5862a261c491db9c2ed701e18ad59b
Peng Xu [Wed, 28 Sep 2016 03:36:52 +0000 (03:36 +0000)]
[sensorservice] Fix inconsistent states in SensorDevice
am:
4f707f8b3d
Change-Id: I1090cee6b4b81e10d0b5bc31ab879b1a3788d407
Treehugger Robot [Wed, 28 Sep 2016 03:32:56 +0000 (03:32 +0000)]
Merge "Migrate libandroid headers to ndk_headers."
Peng Xu [Wed, 28 Sep 2016 03:31:35 +0000 (03:31 +0000)]
Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
Colin Cross [Mon, 26 Sep 2016 20:33:59 +0000 (13:33 -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: I7748934f1e9515176e2ae98d2c0e58d165a7a5c2
Colin Cross [Mon, 26 Sep 2016 20:08:16 +0000 (13:08 -0700)]
Use uint32_t consistently for region op
An implicit conversion warning was being hidden by the use of -isystem
to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I008ef537a24311d58816fae12ef8c4aeaba07547
Colin Cross [Mon, 26 Sep 2016 20:07:06 +0000 (13:07 -0700)]
Fix trailing semicolon warnings
Remove semicolons after inline function definitions. The warnings were
being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I1027e87f459c36a575cd04b3afb645736832b07b
OSDN Git Service
