Dan Albert
628e4b767f
am 0df62a7e: am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""
...
* commit '0df62a7e1511667043ced8f57b2dab072fb88dd5':
Revert "Switch adb to epoll(2)."
2014-09-25 22:44:16 +00:00
Dan Albert
0df62a7e15
am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""
...
* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
Revert "Switch adb to epoll(2)."
2014-09-25 22:32:26 +00:00
Dan Albert
8e1e54154b
am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""
...
* commit '5b4a1767f6e4802c99071305e5b69b1ed22ad292':
Revert "Switch adb to epoll(2)."
2014-09-25 22:26:16 +00:00
Dan Albert
5b4a1767f6
Merge "Revert "Switch adb to epoll(2).""
2014-09-25 22:17:13 +00:00
Dan Albert
45741ae2ea
Revert "Switch adb to epoll(2)."
...
This reverts commit 67de1557b0 .
2014-09-25 15:10:34 -07:00
Ian Rogers
c15279faed
am ecd1d94f: am 8a65899e: am f502b384: Merge "LibNativeBridge: Fix mac build warning"
...
* commit 'ecd1d94f14585aceaf86d257f12719b3e6552522':
LibNativeBridge: Fix mac build warning
2014-09-25 04:07:00 +00:00
Ian Rogers
ecd1d94f14
am 8a65899e: am f502b384: Merge "LibNativeBridge: Fix mac build warning"
...
* commit '8a65899e8a58047c1a29e243719ec25bf59a3448':
LibNativeBridge: Fix mac build warning
2014-09-25 03:55:42 +00:00
Ian Rogers
8a65899e8a
am f502b384: Merge "LibNativeBridge: Fix mac build warning"
...
* commit 'f502b3842739503e9f09675fc02787b8982dc58f':
LibNativeBridge: Fix mac build warning
2014-09-25 03:50:07 +00:00
Ian Rogers
f502b38427
Merge "LibNativeBridge: Fix mac build warning"
2014-09-25 03:44:40 +00:00
Andreas Gampe
4390a63236
LibNativeBridge: Fix mac build warning
...
Change-Id: I5a819cb5edb064b8a7288b5f2b3100c515421adf
2014-09-24 20:14:28 -07:00
Andreas Gampe
a20445eb40
am b79956b2: am 44f20f70: am 13f00594: Merge "LibNativeHelper: No bind mount on mac"
...
* commit 'b79956b2a0cbaba8ecc420053b2e36fb981a2f4f':
LibNativeHelper: No bind mount on mac
2014-09-25 00:06:18 +00:00
Andreas Gampe
b79956b2a0
am 44f20f70: am 13f00594: Merge "LibNativeHelper: No bind mount on mac"
...
* commit '44f20f7055cb2d7af7d01a702fe0648e34647aba':
LibNativeHelper: No bind mount on mac
2014-09-24 23:55:50 +00:00
Andreas Gampe
44f20f7055
am 13f00594: Merge "LibNativeHelper: No bind mount on mac"
...
* commit '13f00594f89721cee6cd983a190b8da141e1a34b':
LibNativeHelper: No bind mount on mac
2014-09-24 23:46:57 +00:00
Andreas Gampe
13f00594f8
Merge "LibNativeHelper: No bind mount on mac"
2014-09-24 23:40:28 +00:00
Andreas Gampe
962eb40abb
LibNativeHelper: No bind mount on mac
...
Cannot bind-mount /proc/cpuinfo on the mac.
Change-Id: Id5f0cd46ba0eba484477c56bbecf14d95e88d6f2
2014-09-24 16:36:17 -07:00
Andreas Gampe
050c7e05db
am 69974972: resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp
...
* commit '69974972bec274bc6da6749707fe0c8ce2bc0c0d':
LibNativeBridge: Add early init & env setup
2014-09-24 23:08:46 +00:00
Andreas Gampe
c99dc22c81
am 7b11f62a: (-s ours) Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
...
* commit '7b11f62a348602ac20faaec8f4d3ab684abb93b4':
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
2014-09-24 23:08:45 +00:00
Andreas Gampe
69974972be
resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp
2014-09-24 16:00:12 -07:00
Andreas Gampe
7b11f62a34
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
...
This reverts commit f00de413ed .
2014-09-24 15:58:23 -07:00
Andreas Gampe
64884bb135
am 9d1b9227: Merge "LibNativeBridge: Add early init & env setup"
...
* commit '9d1b922725822a7017318f738f67831a994c8fdf':
LibNativeBridge: Add early init & env setup
2014-09-24 22:10:18 +00:00
Andreas Gampe
9d1b922725
Merge "LibNativeBridge: Add early init & env setup"
2014-09-24 22:00:06 +00:00
Ruchi Kandoi
53272db8bd
am d486ff20: am ce6bfc93: am 301a907f: Merge "healthd: charger: Run animation even if capacity is 0" into lmp-dev
...
* commit 'd486ff2030f0394c0992b8f7117f0e4c29acbbc4':
healthd: charger: Run animation even if capacity is 0
2014-09-24 18:05:04 +00:00
Ruchi Kandoi
d486ff2030
am ce6bfc93: am 301a907f: Merge "healthd: charger: Run animation even if capacity is 0" into lmp-dev
...
* commit 'ce6bfc93a1843a48f1f459fcefb30bf9f05aa013':
healthd: charger: Run animation even if capacity is 0
2014-09-24 17:49:24 +00:00
Elliott Hughes
08e1b7daf6
am 4ac3d28d: am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now."
...
* commit '4ac3d28deae461c85973416189f8e5d503895505':
bionic has O_RSYNC now.
2014-09-24 17:18:27 +00:00
Eric Laurent
ca4018dde5
am 4c58d894: am 62e05407: am f6cce347: audio: add HW hotword capture flag
...
* commit '4c58d8945281fa2a41e36b4ed3b93fdcf56c1bb4':
audio: add HW hotword capture flag
2014-09-24 17:17:07 +00:00
Ruchi Kandoi
ce6bfc93a1
am 301a907f: Merge "healthd: charger: Run animation even if capacity is 0" into lmp-dev
...
* commit '301a907f28570ff1627e30a37069e6c5ab6a4b75':
healthd: charger: Run animation even if capacity is 0
2014-09-24 17:11:43 +00:00
Ruchi Kandoi
301a907f28
Merge "healthd: charger: Run animation even if capacity is 0" into lmp-dev
2014-09-24 16:58:56 +00:00
Elliott Hughes
4ac3d28dea
am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now."
...
* commit '5da0e2ee2bd695d8644af3b18d045d6046a4fba8':
bionic has O_RSYNC now.
2014-09-24 05:08:59 +00:00
Elliott Hughes
5da0e2ee2b
am 49e37652: Merge "bionic has O_RSYNC now."
...
* commit '49e37652cd7e61612d13c630759677bcb9231153':
bionic has O_RSYNC now.
2014-09-24 04:57:48 +00:00
Elliott Hughes
49e37652cd
Merge "bionic has O_RSYNC now."
2014-09-24 04:51:03 +00:00
Eric Laurent
4c58d89452
am 62e05407: am f6cce347: audio: add HW hotword capture flag
...
* commit '62e05407da5c36b6c4057e613ae6d4e3068a3721':
audio: add HW hotword capture flag
2014-09-24 04:19:16 +00:00
Elliott Hughes
c2d9837c0e
bionic has O_RSYNC now.
...
Change-Id: Idad77b6ddc0abe270edff773bb0316d30b9f894d
2014-09-23 20:12:05 -07:00
jgu21
ab0da5a9a6
LibNativeBridge: Add early init & env setup
...
Add a method to set up /proc/cpuinfo with enough privileges. Set
up the environment for an app in InitializeNativeBridge().
Turn on -Wall for libnativebridge.
Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
2014-09-23 20:08:25 -07:00
Eric Laurent
62e05407da
am f6cce347: audio: add HW hotword capture flag
...
* commit 'f6cce347a73e3b3da9ff6698ead25b5a543ce47b':
audio: add HW hotword capture flag
2014-09-24 01:34:41 +00:00
Devin Kim
9b0d442385
healthd: charger: Run animation even if capacity is 0
...
If charger is connected and battery capacity is 0, charging animation should
run. The device would be booted up even if capacity is 0 in off-mode charging.
At that time, it would take some time to be 1 from 0 for capacity if you
use USB charger.
Bug: 17606689
Change-Id: I37e0f1b6ab0ee1f6d833882e169bf3ea06cf2399
2014-09-23 17:09:28 -07:00
Todd Poynor
623e93c04a
am 0908b92e: am ebeb0c0e: healthd: use warning level for info logs
...
* commit '0908b92ea9c4a1fe76568bcfb553a5eaa8064b06':
healthd: use warning level for info logs
2014-09-23 22:47:16 +00:00
Todd Poynor
0908b92ea9
am ebeb0c0e: healthd: use warning level for info logs
...
* commit 'ebeb0c0ea63af9fd8b2c8a7a20f919e48098ad9a':
healthd: use warning level for info logs
2014-09-23 22:35:58 +00:00
Todd Poynor
ebeb0c0ea6
healthd: use warning level for info logs
...
To allow healthd/charger info to appear in systems where the loglevel
has been bumped to squelch chatty drivers.
Change-Id: I4ab135765700d7584a1ce5d972ea473d77f299f8
2014-09-23 15:05:07 -07:00
Elliott Hughes
e4090c92ff
am 4f3ebaec: am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."
...
* commit '4f3ebaec16e7f899c4afb39ce9e08db6b989428c':
Switch adb to epoll(2).
2014-09-23 20:56:38 +00:00
Elliott Hughes
8b28a70980
am ed561793: am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
...
* commit 'ed561793f304fd6cbc248223ec71b93dcc126562':
defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 19:07:59 +00:00
Elliott Hughes
4f3ebaec16
am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."
...
* commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a':
Switch adb to epoll(2).
2014-09-23 18:57:42 +00:00
Elliott Hughes
790e7c0ac4
am 3772545c: Merge "Switch adb to epoll(2)."
...
* commit '3772545c22fb28e27d150c97f88dd3b7c0a7c741':
Switch adb to epoll(2).
2014-09-23 18:45:35 +00:00
Elliott Hughes
3772545c22
Merge "Switch adb to epoll(2)."
2014-09-23 18:36:24 +00:00
Elliott Hughes
67de1557b0
Switch adb to epoll(2).
...
Bug: 17588403
Change-Id: I2590f5e7dd4e178ff4f743609c5ef0155b1015a1
2014-09-23 10:40:51 -07:00
Elliott Hughes
35d6017457
am 28891d26: am ae3a8961: am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths"
...
* commit '28891d262f21988ef3d43e4a3dfca0c9d4370cf8':
init: Fix memory corruption when sanitizing platform paths
2014-09-23 16:20:24 +00:00
Dan Albert
8647769f2f
am 641ced11: am ffbb05e6: am fbe58079: Merge "Fix warning for uninitialized variable."
...
* commit '641ced1127ef12e8d223bf5fe75e9e6a2f75c818':
Fix warning for uninitialized variable.
2014-09-23 16:20:02 +00:00
Elliott Hughes
ed561793f3
am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
...
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 16:05:52 +00:00
Elliott Hughes
fbb4188cfa
am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
...
* commit 'd559d6c72a411d14c7a964dad1eb7f6e229314cb':
defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 15:59:01 +00:00
Elliott Hughes
d559d6c72a
Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
2014-09-23 15:51:10 +00:00
Elliott Hughes
cb3d65323d
defined(HAVE_OFF_T) is really just !defined(__APPLE__).
...
Change-Id: I83c271bfe24b777acf293d2b4ac5af2cce8398b9
2014-09-22 20:50:54 -07:00