Commit graph

25400 commits

Author SHA1 Message Date
Elliott Hughes
ab273a5a4b Move libbinderwrapper's headers into libbinderwrapper. am: 40104501fa am: c5cc029993
am: 761c529b37

Change-Id: Iabb74f1a8ea0c79821b2ee3efbfce4bfbccbac13
2016-09-16 18:04:57 +00:00
Elliott Hughes
761c529b37 Move libbinderwrapper's headers into libbinderwrapper. am: 40104501fa
am: c5cc029993

Change-Id: I351680f306d7fb8814f8b41eb9e895a1a4153827
2016-09-16 17:51:24 +00:00
Elliott Hughes
c5cc029993 Move libbinderwrapper's headers into libbinderwrapper.
am: 40104501fa

Change-Id: Icc06adc4c044cffec1738ae8f21c4f1a39840d87
2016-09-16 17:48:53 +00:00
Elliott Hughes
40104501fa Move libbinderwrapper's headers into libbinderwrapper.
It was probably the LOCAL_EXPORT_C_INCLUDE_DIRS that made me miss this on the
original code review...

Change-Id: I55bc0b0698604338cd206bf5f336798929b6d8f9
2016-09-16 09:02:47 -07:00
Josh Gao
ee1f7f312c Merge changes I0a00b3d4,I19cb0694 am: 67855d8454 am: ba4a61348d
am: 60cc3c37ec

Change-Id: Ib981dc35ec4fcd3f7306adf6b064571eee46306e
2016-09-15 02:32:40 +00:00
Josh Gao
264b3465dd adb: let adb push follow symlinks. am: 94dc19ff57 am: 30ecda227c
am: 3e64efbced

Change-Id: Ifbedcf881b2724f6203059037b37032b7a2d3ddd
2016-09-15 02:32:35 +00:00
Josh Gao
97bc5d99cc base: add parameter that controls O_NOFOLLOW in file functions. am: ffabc9651f am: 493c215aa2
am: dd63ce4921

Change-Id: If913254105c22287494e718eb100b8eb47ed1e1f
2016-09-15 02:32:29 +00:00
Josh Gao
60cc3c37ec Merge changes I0a00b3d4,I19cb0694 am: 67855d8454
am: ba4a61348d

Change-Id: I918b1c809f23b6e9086f743f635a9d29d0ec2cc3
2016-09-15 02:29:41 +00:00
Josh Gao
3e64efbced adb: let adb push follow symlinks. am: 94dc19ff57
am: 30ecda227c

Change-Id: I10dfdd0265403628c2ef163771cdb576c90419c6
2016-09-15 02:29:35 +00:00
Josh Gao
dd63ce4921 base: add parameter that controls O_NOFOLLOW in file functions. am: ffabc9651f
am: 493c215aa2

Change-Id: I26de28ba4644b56b88d6aa65f38eb3adc2f006ef
2016-09-15 02:29:28 +00:00
Josh Gao
ba4a61348d Merge changes I0a00b3d4,I19cb0694
am: 67855d8454

Change-Id: I4d98ea47da41b1d8543a29a8e3539d73389067c6
2016-09-15 02:27:33 +00:00
Josh Gao
30ecda227c adb: let adb push follow symlinks.
am: 94dc19ff57

Change-Id: I408ebb7b3091e67bd7025b3a6404f57c7f3af377
2016-09-15 02:27:33 +00:00
Josh Gao
493c215aa2 base: add parameter that controls O_NOFOLLOW in file functions.
am: ffabc9651f

Change-Id: Ied9fe3e37a325c185319b4b915e1f0fb9473af7d
2016-09-15 02:27:27 +00:00
Treehugger Robot
67855d8454 Merge changes I0a00b3d4,I19cb0694
* changes:
  adb: let `adb push` follow symlinks.
  base: add parameter that controls O_NOFOLLOW in file functions.
2016-09-15 02:19:14 +00:00
Josh Gao
94dc19ff57 adb: let adb push follow symlinks.
Bug: http://b/31491920
Test: touch foo; ln -s foo bar; adb push bar /data/local/tmp
Test: python test_device.py
Change-Id: I0a00b3d49fdf7206e27d66ac110b56e22449a1ad
2016-09-14 17:08:22 -07:00
Josh Gao
ffabc9651f base: add parameter that controls O_NOFOLLOW in file functions.
Bug: http://b/31491920
Change-Id: I19cb06941d87c0180ccab8bb2d85e57338811624
Test: m
2016-09-14 17:08:22 -07:00
Josh Gao
4f54f18249 Merge "Fix darwin build break." am: 1a73e9b7e2 am: 8fc46f7c6c
am: 50ccd9a7aa

Change-Id: I097e68733d10d701ff15af7e342e7458aae5d1ad
2016-09-14 21:20:34 +00:00
Josh Gao
50ccd9a7aa Merge "Fix darwin build break." am: 1a73e9b7e2
am: 8fc46f7c6c

Change-Id: I4998785bf5d83d26466007b0ded7b0a6523ab33f
2016-09-14 21:14:03 +00:00
Josh Gao
8fc46f7c6c Merge "Fix darwin build break."
am: 1a73e9b7e2

Change-Id: Ie00c1ae1f8431659606adaaf78deffc25fb85118
2016-09-14 21:11:02 +00:00
Josh Gao
1a73e9b7e2 Merge "Fix darwin build break." 2016-09-14 21:02:01 +00:00
Josh Gao
c95afaa20b Fix darwin build break.
Bug: http://b/31468413
Change-Id: I12fdf0977213eefc7043939964070025a672881a
2016-09-14 13:54:45 -07:00
Josh Gao
112c3bf6b9 Merge changes Ie15fcb8f,I0a895911 am: c9c555b8dd am: 173c1fefe6
am: a93f3036a0

Change-Id: Idfefc33d5cc5d9ce6db82ef4c46809e8f691b255
2016-09-14 20:29:41 +00:00
Josh Gao
36fd013bb1 base: add quick_exit emulation. am: 0c44256ae4 am: 63b499d93d
am: b2bc800270

Change-Id: I91d4b4dc725389e6a2365eeaa8e62d99f75737fe
2016-09-14 20:29:35 +00:00
Josh Gao
a7f27185a2 base: extract mutex.h from logging.cpp. am: 63bdcb57aa am: c55eba3a6e
am: d47fd598df

Change-Id: Ifc816225002def65b80c3109e2abd9db4cf8b2ce
2016-09-14 20:29:29 +00:00
Josh Gao
a93f3036a0 Merge changes Ie15fcb8f,I0a895911 am: c9c555b8dd
am: 173c1fefe6

Change-Id: I57ac459f3f47326935324db8c1f477305baac622
2016-09-14 20:26:41 +00:00
Josh Gao
b2bc800270 base: add quick_exit emulation. am: 0c44256ae4
am: 63b499d93d

Change-Id: I2cffecc3d53e1877aa04d197c9f4655c42d6069f
2016-09-14 20:26:35 +00:00
Josh Gao
d47fd598df base: extract mutex.h from logging.cpp. am: 63bdcb57aa
am: c55eba3a6e

Change-Id: I99116770fd766686f6b7c6fad6e21abeb47d2d2a
2016-09-14 20:26:29 +00:00
Josh Gao
173c1fefe6 Merge changes Ie15fcb8f,I0a895911
am: c9c555b8dd

Change-Id: I7d1a7b3b9c14853796d0e601346fd93af71f4c60
2016-09-14 20:23:36 +00:00
Josh Gao
63b499d93d base: add quick_exit emulation.
am: 0c44256ae4

Change-Id: I28ebce03b898435b2ede2bace01778c2ee606a18
2016-09-14 20:23:35 +00:00
Josh Gao
c55eba3a6e base: extract mutex.h from logging.cpp.
am: 63bdcb57aa

Change-Id: I93575399e1dec5e51a897904aaa38997360ddc2f
2016-09-14 20:23:29 +00:00
Treehugger Robot
c9c555b8dd Merge changes Ie15fcb8f,I0a895911
* changes:
  base: add quick_exit emulation.
  base: extract mutex.h from logging.cpp.
2016-09-14 20:14:53 +00:00
Josh Gao
0c44256ae4 base: add quick_exit emulation.
Bug: http://b/31468413
Change-Id: Ie15fcb8ff0613d01a0eb7437a2cb37283aa52bab
Test: mma, libbase_test on Linux/Windows
2016-09-13 17:54:50 -07:00
Andreas Gampe
4650bbdf7c Merge "Base: Fix dangling-else in CHECK_STROP" am: ad81a1d94a am: 8c42c0ba1d
am: 3a6f55bb76

Change-Id: I4f3e072050bc26cc4031fddcd66d919df1255ad3
2016-09-13 23:25:10 +00:00
Andreas Gampe
3a6f55bb76 Merge "Base: Fix dangling-else in CHECK_STROP" am: ad81a1d94a
am: 8c42c0ba1d

Change-Id: If1af507b579945333ae1d8e1769c5e25c5225d4a
2016-09-13 23:22:08 +00:00
Andreas Gampe
8c42c0ba1d Merge "Base: Fix dangling-else in CHECK_STROP"
am: ad81a1d94a

Change-Id: Iae70ed275d5f1c0cab2b5626284079c8a08c9ac4
2016-09-13 23:19:09 +00:00
Treehugger Robot
ad81a1d94a Merge "Base: Fix dangling-else in CHECK_STROP" 2016-09-13 23:09:37 +00:00
Josh Gao
63bdcb57aa base: extract mutex.h from logging.cpp.
Extract the Windows-specific mutex implementation from logging.cpp.

Bug: http://b/31468413
Change-Id: I0a895911ec6d815b8011b09d55209b64bbf9a70e
Test: mma
2016-09-13 15:59:46 -07:00
Andreas Gampe
d8f26e2ac9 Base: Fix dangling-else in CHECK_STROP
Follow-up to commit 2527628eda.

Bug: 26962895
Bug: 31338270
Test: m
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: Ifd71314e146ebf3957cc053ee95ef85002c909b4
2016-09-13 14:16:37 -07:00
Todd Kjos
9453ea8ba9 resolve merge conflicts of c6937f2 to nyc-mr1-dev-plus-aosp
Change-Id: I82638b0dab5e1b5117f4ed4752fd2cbdaf8c47b1
2016-09-13 12:40:32 -07:00
TuHailong
c6937f2621 Merge "Fix zygote energy-aware scheduler tuning bug" am: de029a894a
am: a6d17f2513

Change-Id: I7a4403d0611666b81c354f67cf479206d2c2d7ae
2016-09-13 19:23:31 +00:00
TuHailong
a6d17f2513 Merge "Fix zygote energy-aware scheduler tuning bug"
am: de029a894a

Change-Id: I7aeefcd7fc238e10ca74a4c101573eea9b51125f
2016-09-13 19:20:49 +00:00
Treehugger Robot
de029a894a Merge "Fix zygote energy-aware scheduler tuning bug" 2016-09-13 19:04:38 +00:00
Damien Bargiacchi
afd59e2f11 resolve merge conflicts of 565ba02 to nyc-mr1-dev-plus-aosp
Change-Id: Ic2152775c96dc28f808fc7b97433f8c3d2135948
2016-09-13 08:37:37 -07:00
Damien Bargiacchi
565ba02b89 Allow customization of charger animation
Allow the charging animation to be customized with a configuration file
and custom assets.

 - Add a parser to parse a custom configuration file.
 - Add support for showing a clock and the battery percentage.
 - Expand feature that conditionally shows animation frames using min_level
   and level_only to min_level and max_level

BUG: 29547343
Change-Id: Ia33f4bb37dc7d4c7fa6507a63481e93bf0bf9738
2016-09-12 21:07:27 -07:00
Bill Yi
24952cf098 Merge "Remove crash_reporter and metricsd" am: 07572a92b9 am: ebbf249d94
am: 64a2790064

Change-Id: If296ef6175155601004fe929a1685e9bf2084817
2016-09-12 16:47:57 +00:00
Bill Yi
64a2790064 Merge "Remove crash_reporter and metricsd" am: 07572a92b9
am: ebbf249d94

Change-Id: I11c71f00b3c68d0b9afae868e746a6dde5546561
2016-09-12 16:44:03 +00:00
Bill Yi
ebbf249d94 Merge "Remove crash_reporter and metricsd"
am: 07572a92b9

Change-Id: Ie99dc378f541da4b73c76b837c08c44375aafe68
2016-09-12 16:25:33 +00:00
Bill Yi
07572a92b9 Merge "Remove crash_reporter and metricsd" 2016-09-12 16:19:49 +00:00
Erik Kline
a77ccb83e8 Merge "Remove deprecated libnetutils DHCPv4 code" am: 2713c88a62 am: 7f0c81793b
am: 2a79e543d3

Change-Id: I69ef466913c67033a4c156c3d52a8fb2ff00fd19
2016-09-12 04:16:18 +00:00
Erik Kline
2a79e543d3 Merge "Remove deprecated libnetutils DHCPv4 code" am: 2713c88a62
am: 7f0c81793b

Change-Id: I1a9210b8ef339bce79abf46e9d423a83811cd4f8
2016-09-12 04:13:18 +00:00