c9e209dc35
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours am: b1fada1564 am: 466a521607 -s ours am: ea11f5547c am: f93261010a am: 6a40db71f7 am: fc6c0a3480 -s ours am: 9df391f156 am: ab177b77f7 am: acdde34428 am: c706c7ffcc am: 5a97ef91d8
...
am: 2422a0db5b
2016-11-30 03:33:02 +00:00
01174151a0
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp am: 524afcec4a
...
am: f19a1fcc90
2016-11-30 03:32:47 +00:00
025a447a80
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d am: 79517d4f9f
...
am: effc9de94a
2016-11-30 03:30:04 +00:00
43fbfbdb54
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280 am: 8dab84a673
...
am: d85207481e
2016-11-30 03:29:48 +00:00
ddc80bd771
fs_mgr: Fix disable-verity for verifyatboot partitions am: dd78ae75ff
...
am: cfbf6d71a9
2016-11-30 03:29:32 +00:00
cc2d0c06e8
Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90 am: b928a3485a
...
am: 641a541a6f
2016-11-30 03:29:10 +00:00
c8dada7576
adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f am: 8dac33914a am: 2a201fff82 am: a198e406c8
...
am: f3e0563949
2016-11-30 03:28:52 +00:00
ac0fdce7cb
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours am: 3bd49af10b -s ours am: af7dbf4d7a am: b01cb2a926 -s ours am: 778fff4ae8 am: 4e37d97d61 am: 0735bfdd3a am: d540186b0d -s ours am: f6e21cb1f8 am: dd11742510 am: 4f99cb9cb9 am: 268bdfb840
...
am: 1ff7b760e7
2016-11-30 03:28:32 +00:00
d68d20e073
Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours am: 65e59a4960 am: fb3d3904d0 -s ours am: 4b9c44dcf7 am: cc236b7e94 am: 76af41ef0a am: 18b8b0f168 -s ours am: 3ef91bbffa am: 0da14e91c6 am: 5e10383130 am: 80dc7605b9
...
am: 8727b53a2f
2016-11-30 03:28:17 +00:00
2422a0db5b
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours am: b1fada1564 am: 466a521607 -s ours am: ea11f5547c am: f93261010a am: 6a40db71f7 am: fc6c0a3480 -s ours am: 9df391f156 am: ab177b77f7 am: acdde34428 am: c706c7ffcc
...
am: 5a97ef91d8
2016-11-30 03:28:02 +00:00
f19a1fcc90
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp
...
am: 524afcec4a
2016-11-30 03:27:47 +00:00
effc9de94a
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d
...
am: 79517d4f9f
2016-11-30 03:24:30 +00:00
d85207481e
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280
...
am: 8dab84a673
2016-11-30 03:24:14 +00:00
cfbf6d71a9
fs_mgr: Fix disable-verity for verifyatboot partitions
...
am: dd78ae75ff
2016-11-30 03:23:57 +00:00
641a541a6f
Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90
...
am: b928a3485a
2016-11-30 03:23:42 +00:00
f3e0563949
adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a -s ours am: 5c81df2726 am: f55e22a7d3 am: df519a87fb am: 7f523007a1 am: 5a91535d1f am: d4b7250550 am: b71782888f am: 8dac33914a am: 2a201fff82
...
am: a198e406c8
2016-11-30 03:23:23 +00:00
1ff7b760e7
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: a7ba9ff00b am: 4f3df4e131 am: ccfb7619f4 -s ours am: 3bd49af10b -s ours am: af7dbf4d7a am: b01cb2a926 -s ours am: 778fff4ae8 am: 4e37d97d61 am: 0735bfdd3a am: d540186b0d -s ours am: f6e21cb1f8 am: dd11742510 am: 4f99cb9cb9
...
am: 268bdfb840
2016-11-30 03:23:04 +00:00
8727b53a2f
Merge "DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket" into lmp-dev am: 40138b630c -s ours am: 65e59a4960 am: fb3d3904d0 -s ours am: 4b9c44dcf7 am: cc236b7e94 am: 76af41ef0a am: 18b8b0f168 -s ours am: 3ef91bbffa am: 0da14e91c6 am: 5e10383130
...
am: 80dc7605b9
2016-11-30 03:22:46 +00:00
5a97ef91d8
DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e -s ours am: b1fada1564 am: 466a521607 -s ours am: ea11f5547c am: f93261010a am: 6a40db71f7 am: fc6c0a3480 -s ours am: 9df391f156 am: ab177b77f7 am: acdde34428
...
am: c706c7ffcc
2016-11-30 03:22:29 +00:00
524afcec4a
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp
...
Change-Id: I20f24693f201f1a15ded1fd6dfb6d56a58ebcaa8
2016-11-29 17:17:26 -08:00
9da6a7da1b
Merge "Revert "Switch sdcardfs over to bind mounts.""
2016-11-30 00:25:04 +00:00
1acb5086dc
Revert "Switch sdcardfs over to bind mounts."
...
This reverts commit 912c27f63c
2016-11-30 00:22:25 +00:00
7175584186
Merge "Switch sdcardfs over to bind mounts."
2016-11-30 00:22:17 +00:00
8a475f7e4a
delete toolbox/r.c
...
/dev/mem has been turned off on all Android kernels (b/19549480). This
utility cannot be used.
Test: android compiles.
Change-Id: I500021f224febb15dd8bfe6e1f6e5c398fe6f552
2016-11-29 15:45:11 -08:00
6b694a76f5
ion.c: add O_CLOEXEC to /dev/ion open
...
Test: device boots and no obvious problems.
Change-Id: I0845b79de49b77878adaf6cd14cc506f7586cccb
2016-11-29 15:20:33 -08:00
7aa5a20d10
healthd: Show animation before waiting on timer am: 6f8314900f am: 9291de89b9
...
am: a441881e15
2016-11-29 21:51:42 +00:00
d7dcc91127
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev am: 085c91bedd am: d918b70712
...
am: 1f7184897f
2016-11-29 21:51:27 +00:00
00fe242060
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: b892613793
...
am: 89e09e5aeb
2016-11-29 21:51:11 +00:00
32e2657214
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp am: 485c647432
...
am: f026d11edf
2016-11-29 21:50:56 +00:00
a441881e15
healthd: Show animation before waiting on timer am: 6f8314900f
...
am: 9291de89b9
2016-11-29 21:46:04 +00:00
1f7184897f
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev am: 085c91bedd
...
am: d918b70712
2016-11-29 21:45:50 +00:00
89e09e5aeb
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
...
am: b892613793
2016-11-29 21:45:27 +00:00
f026d11edf
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp
...
am: 485c647432
2016-11-29 21:45:26 +00:00
9291de89b9
healthd: Show animation before waiting on timer
...
am: 6f8314900f
2016-11-29 21:40:59 +00:00
d918b70712
Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev
...
am: 085c91bedd
2016-11-29 21:40:44 +00:00
0910d2dbb9
Enable liblog on host bionic
...
Some of the __BIONIC__ checks were actually looking for an android
device. Host bionic has __BIONIC__, but not __ANDROID__.
Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ia0ca36fc9486fe8ea7e5d1b2e26ab0491903723c
2016-11-29 13:39:55 -08:00
b892613793
Merge "resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-11-29 21:39:14 +00:00
ab34b47b35
Enable libbase/libutils/libziparchive on host bionic
...
Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ib42c063532c1cbeb3e1418ab16a1fb54d5902aab
2016-11-29 13:38:53 -08:00
b104c502e1
init: Fix sync issue on property trigger.
...
This issue reproduces in the following senario.
1. ("", "") is added to queue;
2. property_triggers_enabled is set to 1;
3. user defined property is triggered, like sys.usb.config=adb;
4. ("sys.usb.config", "adb") is added to queue;
5. main loop interpret ("", "") and queue all current triggers to execution,
so ("sys.usb.config", "adb") is queued for execution for the first time.
6. main loop interpret ("sys.usb.config", "adb"), it is queued for
execution for a second time.
The second time makes ASIT fail.
Bug: http://b/28218187
Change-Id: I230e175e0dca8989f1e5bd812398da90082d0ec1
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
2016-11-29 20:19:17 +00:00
cc35a55198
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" am: 9bfd9f558b am: 10f4044341 am: 857230c5d9
...
am: f1f765e454
2016-11-29 20:02:20 +00:00
f1f765e454
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" am: 9bfd9f558b am: 10f4044341
...
am: 857230c5d9
2016-11-29 19:57:19 +00:00
857230c5d9
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" am: 9bfd9f558b
...
am: 10f4044341
2016-11-29 19:51:50 +00:00
10f4044341
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
...
am: 9bfd9f558b
2016-11-29 19:46:50 +00:00
9bfd9f558b
Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
2016-11-29 19:37:48 +00:00
485c647432
resolve merge conflicts of e3083de to nyc-mr1-dev-plus-aosp
...
Change-Id: Iba35210bc2133d79b2ba8ceb63e355507c7c0f03
2016-11-29 11:28:26 -08:00
842aea719d
Merge "Always show the battery percentage unless it is unknown" into cw-f-dev am: cd542213e8 am: f2fabc9926
...
am: b0686f88cf
2016-11-29 19:21:48 +00:00
a1faaf7bdc
Always show the battery percentage unless it is unknown am: 3f0250c3cc am: fdce0878f1
...
am: bbff20dc1d
2016-11-29 19:21:33 +00:00
3bfbe61a2d
Merge "healthd: allow override of wake interval timing" into cw-f-dev am: a1be7d1bb5 am: 610e0ec98f
...
am: 7216ba476f
2016-11-29 19:21:18 +00:00
50ae5be1de
Merge "resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 75c815251c
...
am: e5f6c292ca
2016-11-29 19:21:03 +00:00
7d6b2ed5ca
resolve merge conflicts of 1f1a6fd to nyc-mr1-dev-plus-aosp am: 1e811fca22
...
am: 4cf68bd5e4
2016-11-29 19:20:48 +00:00
Tianjie Xu