Chih-Hung Hsieh
6fd2d4bb57
Add -Wno-error to compile with global -Werror.
...
Bug: 66996870
Test: normal builds.
Change-Id: Iee4ac5f95a2013c5eeac1c061889a593caf0ec36
2018-01-04 12:09:30 -08:00
android-build-team Robot
4cda400135
Snap for 4517567 from bc8c0bd715
to pi-release
...
Change-Id: Ib5ce55df72353e80ff39be8f7d0d94efc6bbeeda
2017-12-24 08:35:39 +00:00
Mark Salyzyn
bc8c0bd715
Merge "msm8998: deprecate cutils/log.h" am: 4b9d106819
am: c772749779
...
am: 81b9384c99
Change-Id: I2abc0b18e1d29db3ef50f81d2bc7976eaddf88bf
2017-12-21 17:44:10 +00:00
Mark Salyzyn
81b9384c99
Merge "msm8998: deprecate cutils/log.h" am: 4b9d106819
...
am: c772749779
Change-Id: I8d2874096cf4807e93820f98abfd668d58280ee2
2017-12-20 20:36:12 +00:00
Mark Salyzyn
c772749779
Merge "msm8998: deprecate cutils/log.h"
...
am: 4b9d106819
Change-Id: I51c2aa18468a3d9d1db52d7130fa16eebefed5f9
2017-12-20 20:32:10 +00:00
Treehugger Robot
4b9d106819
Merge "msm8998: deprecate cutils/log.h"
2017-12-20 20:20:08 +00:00
Mark Salyzyn
96a73c98ee
msm8998: deprecate cutils/log.h
...
Replace cutils/log.h with log/log.h. Fix up header ordering.
Test: compile
Bug: 34250038
Change-Id: Ib9d9f9919e6a220205014c2f720f7b9633e1bc87
2017-12-19 10:00:55 -08:00
android-build-team Robot
ad63240429
Snap for 4502278 from 288acc3d60
to pi-release
...
Change-Id: I14e054982641b8b43de21148d0509f322c409924
2017-12-14 08:32:36 +00:00
Dan Albert
288acc3d60
Merge "Include what we use." am: 9dcefac54e
am: 914b61ef78
...
am: 8f398130db
Change-Id: I040d6fe0b8d18f06dadb3441d572afa9a00924e1
2017-12-13 19:50:04 +00:00
Dan Albert
8f398130db
Merge "Include what we use." am: 9dcefac54e
...
am: 914b61ef78
Change-Id: I4c994d86c35bd7eacbfe6488210bdf82fa3f032a
2017-12-13 19:47:35 +00:00
Dan Albert
914b61ef78
Merge "Include what we use."
...
am: 9dcefac54e
Change-Id: I989ed075f45de0f3b32e479d283fc203784a401a
2017-12-13 19:45:02 +00:00
Treehugger Robot
9dcefac54e
Merge "Include what we use."
2017-12-13 19:38:34 +00:00
Dan Albert
3d33750fa9
Include what we use.
...
Test: mma
Bug: None
Change-Id: I0611088b5fe0d7b3c3a7468575abb2756d590091
Exempt-From-Owner-Approval: trivial cleanup
2017-12-12 16:38:59 -08:00
android-build-team Robot
4fc85b6619
Snap for 4496165 from 9dc622a2c7
to pi-release
...
Change-Id: I5d2c5a616a8fc6570930a7700a4fe45247f09396
2017-12-11 12:08:56 +00:00
Xin Li
9dc622a2c7
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 2124ec3f1b
-s ours am: 052494783b
...
am: eb1bafa0b0
-s ours
Change-Id: I0f27ecaf120830cf1dc54a5f1cd1ca1819443eb3
2017-12-08 04:10:31 +00:00
Stephen Li
91b5ea4375
Manually merge changes from giant AOSP topic
...
Change-Id: I074410d3f0e8b614fe0a907ccb79c65dcb904537
2017-12-07 23:32:31 +00:00
Xin Li
eb1bafa0b0
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 2124ec3f1b
-s ours
...
am: 052494783b
Change-Id: I9b9b1b6e684e036c8987a2e0ac104aee18e5af1b
2017-12-07 12:09:56 +00:00
Xin Li
052494783b
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: 2124ec3f1b
-s ours
Change-Id: I804497bb5c3f5879f11dc75db85661e578b2a034
2017-12-07 12:06:03 +00:00
Xin Li
c0a6fee8c7
DO NOT MERGE: Merge Oreo MR1 into master am: 87b6aa9061
-s ours
...
am: feaabd5e2e
Change-Id: Ie84c12610ab8d4c6f089673388923ca5b9a62e89
2017-12-07 06:48:33 +00:00
Xin Li
feaabd5e2e
DO NOT MERGE: Merge Oreo MR1 into master
...
am: 87b6aa9061
-s ours
Change-Id: Idfef9f5265ac7d0453858d97faac98d1f8b67834
2017-12-07 04:20:41 +00:00
Xin Li
2124ec3f1b
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:26 +00:00
Xin Li
87b6aa9061
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I3dd4e5beea2fe225ec341f76ae5f40dd0e51529f
2017-12-06 14:24:51 -08:00
android-build-team Robot
03214122de
Snap for 4484469 from 51407182cf
to pi-release
...
Change-Id: I3b5f279e05272b9996d6392a02d6e458ecf04671
2017-12-05 08:28:43 +00:00
Yi Kong
51407182cf
Merge "Remove unused variable" am: 02880f6383
am: eb53b91b46
...
am: 638241d2a9
Change-Id: Iffe37c807e852f72f2464a8b301e9cd67d4d9459
2017-12-05 01:22:22 +00:00
Yi Kong
638241d2a9
Merge "Remove unused variable" am: 02880f6383
...
am: eb53b91b46
Change-Id: I9fab32724b29f487857956f2c0358cb36896f870
2017-12-05 01:06:44 +00:00
Yi Kong
eb53b91b46
Merge "Remove unused variable"
...
am: 02880f6383
Change-Id: I45affa7c1da94e926788e5af99d88a1253531733
2017-12-05 00:38:45 +00:00
Yi Kong
02880f6383
Merge "Remove unused variable"
2017-12-05 00:13:09 +00:00
Yi Kong
3a1e361a56
Remove unused variable
...
Discovered by the upcoming compiler update.
Test: build
Change-Id: Ibe04228dfa03b82f7d0f86cf2c4a3bb90dd68792
2017-12-04 14:24:50 -08:00
android-build-team Robot
ac0cab53ef
Snap for 4453288 from 849bced41e
to pi-release
...
Change-Id: I7a40d77db2fe6b8e9afe91786556b30ffd89dcc5
2017-11-15 08:31:41 +00:00
Xin Li
849bced41e
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
am: 795ab7d05d
Change-Id: I6c9a41d9a54390160d02f4d004a27463f82e1914
2017-11-15 02:23:44 +00:00
Xin Li
795ab7d05d
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: I847021218ef5a5181f85fcc347dadbabe2f328f5
2017-11-14 16:38:21 -08:00
android-build-team Robot
f4db2ef0ae
Snap for 4450504 from 5d958f5ec1
to pi-release
...
Change-Id: Ic1832d196e5a2b8e334b79699c71a62c1f2baf44
2017-11-14 08:33:03 +00:00
Xin Li
43e07f20da
Merge commit 'e458e16debbc9068c839ce918b2e039d7efefaed' into HEAD
...
Change-Id: If5aaf83103dc48a2efa6c242e55e78da18bec6d2
2017-11-13 14:35:40 -08:00
Rajeswari Konda
5d958f5ec1
8909w: removal of android.hidl.base@1.0
...
removal of android.hidl.base@1.0 as it is already integrated into libhidltransport
Change-Id: I11cc06e8d144f82e819e6593b168b11fe189f768
(cherry picked from commit 66ee0dc5575b0b785e67d87686855f81c914e767)
2017-11-09 21:56:53 +00:00
android-build-team Robot
997f77b268
Snap for 4437123 from 6b159c287b
to pi-release
...
Change-Id: Ia64d458297ed9c7396d18aa87a0e77d24c3ab118
2017-11-07 08:20:40 +00:00
Chih-hung Hsieh
6b159c287b
Merge "Use -Werror in hardware/qcom/display" am: 3066a2f7de
am: 0e49d7f707
...
am: 6543ffb43a
Change-Id: I364464e50fb6cbff15c3ad558f329918040ede2a
2017-11-07 02:22:55 +00:00
Chih-hung Hsieh
6543ffb43a
Merge "Use -Werror in hardware/qcom/display" am: 3066a2f7de
...
am: 0e49d7f707
Change-Id: If61a1cda114ea63a52bca320095e66bf5acdf515
2017-11-07 02:11:59 +00:00
Chih-hung Hsieh
0e49d7f707
Merge "Use -Werror in hardware/qcom/display"
...
am: 3066a2f7de
Change-Id: I1f3e80ff15d608380771579ca605bfa5231f1308
2017-11-07 02:00:43 +00:00
Chih-hung Hsieh
3066a2f7de
Merge "Use -Werror in hardware/qcom/display"
2017-11-07 01:50:04 +00:00
Chih-Hung Hsieh
1cdcad27c9
Use -Werror in hardware/qcom/display
...
* Add missing include $(LOCAL_PATH)/../common.mk and -Werror.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I8cd29680bb623343a0dcac9e541b86a339b5a7c7
2017-11-06 16:03:31 -08:00
android-build-team Robot
2da263d473
Snap for 4428213 from 23beb6bfbe
to pi-release
...
Change-Id: I4e8b1419ff8d4543ad51e27f09cceb9e250650d6
2017-11-01 08:16:10 +00:00
android-build-team Robot
ed597ed466
Merge cherrypicks of [3150410, 3150430] into pi-release
...
Change-Id: I9d293cb66ed70d098d3f86ecfc005808d07a5cff
2017-10-31 22:07:33 +00:00
Courtney Goeltzenleuchter
6ff95eafef
Revert "hwc2: Do not reapply mode if it is the same as before"
...
This CL is causing the Accessibility -> Color inversion option
to not do anything.
Bug: b/63111041
Bug: b/67488442
Bug: b/68129004
Test: manual: Go to Settings -> Accessibility and toggle Color
inversion. Should be obvious change on the screen.
This reverts commit e234d57654
.
Change-Id: I3874612a47d278d8927bfd1f89d07a79ebb4d4cc
(cherry picked from commit 23beb6bfbe
)
2017-10-31 22:07:28 +00:00
Courtney Goeltzenleuchter
23beb6bfbe
Revert "hwc2: Do not reapply mode if it is the same as before"
...
This CL is causing the Accessibility -> Color inversion option
to not do anything.
Bug: b/63111041
Bug: b/67488442
Bug: b/68129004
Test: manual: Go to Settings -> Accessibility and toggle Color
inversion. Should be obvious change on the screen.
This reverts commit e234d57654
.
Change-Id: I3874612a47d278d8927bfd1f89d07a79ebb4d4cc
2017-10-31 13:45:36 -06:00
android-build-team Robot
c005508c5d
Snap for 4422293 from 992d468c28
to pi-release
...
Change-Id: Ib83ebd30f8c032c32f171e803addcdca509eb33b
2017-10-29 08:02:39 +00:00
Madhuri Athota
992d468c28
sdm: Handle commit failure from comp manager correctly
...
Change-Id: I0fe792e1b215a28b8d4faa621bf88366a6c91ae0
Signed-off-by: Madhuri Athota <mathota@codeaurora.org>
(cherry picked from commit ea868137215513f7c63df3b8305ad8405cfa1949)
2017-10-26 22:22:58 +00:00
android-build-team Robot
16d3b38a8a
Snap for 4410151 from 4d64c675ba
to pi-release
...
Change-Id: Ia26fdbf847520b7240545f772ecb1f1d3ec1aa41
2017-10-21 08:13:02 +00:00
Dan Albert
4d64c675ba
Merge "Add missing includes." am: 59779fd150
am: 21e862dc38
am: 082ac4ad0b
...
am: 1ecf46f196
Change-Id: I6b32bb7b0bced0eae67b97313971e510c9d80c87
2017-10-20 23:24:28 +00:00
Dan Albert
1ecf46f196
Merge "Add missing includes." am: 59779fd150
am: 21e862dc38
...
am: 082ac4ad0b
Change-Id: I726b8f0715c455e3c0e4568c71d7fe8fb736f686
2017-10-20 22:25:07 +00:00
Dan Albert
082ac4ad0b
Merge "Add missing includes." am: 59779fd150
...
am: 21e862dc38
Change-Id: Ia23085f025dc2bec1f3934286b96b34e0aa6147b
2017-10-20 22:02:22 +00:00