Dan Albert
c4affb2b4e
am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport."
...
* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
Don't manually link stlport.
2014-09-26 19:53:04 +00:00
Dan Albert
be0d295da9
am 19d686ee: Merge "Don\'t manually link stlport."
...
* commit '19d686ee9340c81c23083fc30bc012f7f6ed5028':
Don't manually link stlport.
2014-09-26 19:45:28 +00:00
Dan Albert
19d686ee93
Merge "Don't manually link stlport."
2014-09-26 19:39:44 +00:00
Dan Albert
b50af2bc60
Don't manually link stlport.
...
Change-Id: I60d2bc868fb9052f120103e9675046ef54f510d0
2014-09-26 10:37:30 -07:00
Andreas Gampe
a29febd13b
am 2d687fe3: am 9f93e297: Merge "LibNativeBridge: Fix two bugs"
...
* commit '2d687fe3d8af29e79ee13e5d6c3d71113d6f575a':
LibNativeBridge: Fix two bugs
2014-09-26 05:14:08 +00:00
Andreas Gampe
2d687fe3d8
am 9f93e297: Merge "LibNativeBridge: Fix two bugs"
...
* commit '9f93e297ee7df04bf605b9dc1251f7c772c48189':
LibNativeBridge: Fix two bugs
2014-09-26 04:59:17 +00:00
Andreas Gampe
9f93e297ee
Merge "LibNativeBridge: Fix two bugs"
2014-09-26 04:47:10 +00:00
Andreas Gampe
2f71cb24fa
LibNativeBridge: Fix two bugs
...
Instruction set comparison must include the termination character
so that prefixes are not identified as equal.
Mount argument order was wrong.
Change-Id: Ib70e36ce2ea5af158ebc9d7fafd00e978348d73d
2014-09-25 21:34:25 -07:00
Andreas Gampe
8b95b06564
am 8dd3ea58: (-s ours) Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev
...
* commit '8dd3ea58fdd99912f631156c37bcb2555ce8aec3':
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
2014-09-25 23:43:51 +00:00
Dan Albert
736fd4a870
am 8e1e5415: am 5b4a1767: Merge "Revert "Switch adb to epoll(2).""
...
* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
Revert "Switch adb to epoll(2)."
2014-09-25 22:32:18 +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
Andreas Gampe
8dd3ea58fd
Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev
2014-09-25 21:55:34 +00:00
Andreas Gampe
25bacb3ab7
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
...
This reverts commit f00de413ed .
Bug: 17645833
Change-Id: Ie5480de9cf4da2c9167db2e6137679019a29f867
2014-09-25 21:46:56 +00:00
Ian Rogers
fee8ffb8da
am 8a65899e: am f502b384: Merge "LibNativeBridge: Fix mac build warning"
...
* commit '8a65899e8a58047c1a29e243719ec25bf59a3448':
LibNativeBridge: Fix mac build warning
2014-09-25 03:55:47 +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
aa60a911d0
am 44f20f70: am 13f00594: Merge "LibNativeHelper: No bind mount on mac"
...
* commit '44f20f7055cb2d7af7d01a702fe0648e34647aba':
LibNativeHelper: No bind mount on mac
2014-09-24 23:55:35 +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
Jeff Sharkey
380e3e67ba
am 2b16bf88: Merge "Include reason when wiping data." into lmp-dev
...
* commit '2b16bf88c768003291f027fdfac94d84abe9dbe6':
Include reason when wiping data.
2014-09-24 23:35:43 +00:00
Jeff Sharkey
2b16bf88c7
Merge "Include reason when wiping data." into lmp-dev
2014-09-24 23:27:57 +00:00
Andreas Gampe
2a0f42b58d
resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aosp
2014-09-24 15:56:29 -07:00
Andreas Gampe
0eed2eb64a
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
...
This reverts commit f00de413ed .
2014-09-24 15:53:39 -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
Jeff Sharkey
d26135b34d
Include reason when wiping data.
...
This will help us track down who requested a data wipe.
Bug: 17412160
Change-Id: I40f73d2d0f08123d2afc044a3dde485151b400d9
2014-09-24 11:46:36 -07:00
Ruchi Kandoi
196ec73d0b
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:50:14 +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
45625ecc43
am 5da0e2ee: am 49e37652: Merge "bionic has O_RSYNC now."
...
* commit '5da0e2ee2bd695d8644af3b18d045d6046a4fba8':
bionic has O_RSYNC now.
2014-09-24 05:08:24 +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
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
e6b10121ad
am f6cce347: audio: add HW hotword capture flag
...
* commit 'f6cce347a73e3b3da9ff6698ead25b5a543ce47b':
audio: add HW hotword capture flag
2014-09-24 02:26:33 +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
Elliott Hughes
0ab784d470
am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."
...
* commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a':
Switch adb to epoll(2).
2014-09-23 18:57:33 +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
830b77bc5c
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:18 +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
Elliott Hughes
2e826dc2b1
am ae3a8961: am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths"
...
* commit 'ae3a8961f01e436a70cab569483b8ebcc1f56c0c':
init: Fix memory corruption when sanitizing platform paths
2014-09-23 02:16:48 +00:00
Elliott Hughes
ae3a8961f0
am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths"
...
* commit 'fed0f06bf04c6de90ae7b2f8ae9158ab2200498e':
init: Fix memory corruption when sanitizing platform paths
2014-09-23 02:05:55 +00:00
Elliott Hughes
fed0f06bf0
Merge "init: Fix memory corruption when sanitizing platform paths"
2014-09-23 01:55:08 +00:00