Elliott Hughes
7f5da85015
Fix scanf %s in lsof. am: 008efb756f
...
am: 491dfb11b7
* commit '491dfb11b762f44dc9848496d5d30514082aab64':
Fix scanf %s in lsof.
Change-Id: Ife17fa56f125dfec08d0d4b0c5c368bdae51106e
2016-05-24 22:13:03 +00:00
Elliott Hughes
491dfb11b7
Fix scanf %s in lsof.
...
am: 008efb756f
* commit '008efb756fea8a9e66a1825b546e9dc392c72bec':
Fix scanf %s in lsof.
Change-Id: I608ae2094649617308b45571df1b649724ec8ac3
2016-05-24 22:10:19 +00:00
Ruchi Kandoi
f2ca669e80
healthd: Check if battery device exists instead of charger drivers before setting fake properties.
...
am: 9cb3d3ccf4
* commit '9cb3d3ccf49bf0fd484563fbf611c68789d5b8a9':
healthd: Check if battery device exists instead of charger drivers before setting fake properties.
Change-Id: I521f7a7d097da915e40a273d73a655aa01ea397e
2016-05-17 18:20:14 +00:00
Ruchi Kandoi
9cb3d3ccf4
healthd: Check if battery device exists instead of charger drivers before
...
setting fake properties.
healthd used to check for registered charger drivers to determine if the
device is an always-plugged device with no battery. This patch changes
it to check for battery instead.
Change-Id: Ie4ff5d3f21dc1a83a780a41eb0c929f66b86d631
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit fabd490f58
)
2016-05-16 08:58:35 -07:00
Elliott Hughes
1baf911bd5
DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot.
...
am: a463d24633
-s ours
* commit 'a463d246339f405981bd690209429ef5acf0f01d':
DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot.
Change-Id: Id9504ed93bedf0f981fc7817d07aee5b74fac8db
2016-05-03 22:54:31 +00:00
Elliott Hughes
a463d24633
DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot.
...
(Backported from AOSP commit: e1746fda6a
)
Change-Id: I661a0538776d4ba74fcee37e2964d987eb861342
2016-05-03 10:14:02 -07:00
Elliott Hughes
008efb756f
Fix scanf %s in lsof.
...
Bug: http://b/28175237
Change-Id: Ief0ba299b09693ad9afc0e3d17a8f664c2fbb8c2
2016-04-19 14:57:09 -07:00
Daniel Rosenberg
251e3609a4
Fix overflow in path building am: 6ea6c04
am: 9c44027
am: 4830087
am: ad431d2
am: 20bf84e
am: 0b35da7
am: 945228b
am: aa7db31
am: cebac70
...
am: 5e7d964
* commit '5e7d964871fe7217bc9042adc181232a4e3c1f38':
Fix overflow in path building
Change-Id: I2318464de6db3c058022f042c57840124f72a5e8
2016-04-14 19:58:14 +00:00
Daniel Rosenberg
5e7d964871
Fix overflow in path building am: 6ea6c04
am: 9c44027
am: 4830087
am: ad431d2
am: 20bf84e
am: 0b35da7
am: 945228b
am: aa7db31
...
am: cebac70
* commit 'cebac700aa133744b2b0b586d71d38d7de64f45a':
Fix overflow in path building
Change-Id: I4d15a213045eb9293638ed1bafcb3137c7994fce
2016-04-14 19:54:47 +00:00
Daniel Rosenberg
cebac700aa
Fix overflow in path building am: 6ea6c04
am: 9c44027
am: 4830087
am: ad431d2
am: 20bf84e
am: 0b35da7
am: 945228b
...
am: aa7db31
* commit 'aa7db31fbd39d90e387b71c41e87a0d37b98882c':
Fix overflow in path building
Change-Id: Id971b55ed73ad4f6b7160f4e9c014e5007d92262
2016-04-14 19:51:41 +00:00
Daniel Rosenberg
aa7db31fbd
Fix overflow in path building am: 6ea6c04
am: 9c44027
am: 4830087
am: ad431d2
am: 20bf84e
am: 0b35da7
...
am: 945228b
* commit '945228bdde777ad3aa814d480d37513db24699fb':
Fix overflow in path building
Change-Id: I6bf39ad97ffeaf70c347fad4166ba239f93f5449
2016-04-14 19:48:22 +00:00
Daniel Rosenberg
945228bdde
Fix overflow in path building am: 6ea6c04
am: 9c44027
am: 4830087
am: ad431d2
am: 20bf84e
...
am: 0b35da7
* commit '0b35da7165e9b78a5e35200bac3df4b2c6bc7c36':
Fix overflow in path building
Change-Id: I07a7bb64ae3174fb8f36cfa1d3651473e5b2f6bf
2016-04-14 19:44:46 +00:00
Daniel Rosenberg
0b35da7165
Fix overflow in path building am: 6ea6c04
am: 9c44027
am: 4830087
am: ad431d2
...
am: 20bf84e
* commit '20bf84eca094e813fa445b60d22bcf0c27148cd4':
Fix overflow in path building
Change-Id: Ia4639f0a0dbcb848a6d9c59319c12cd9bd952c8f
2016-04-14 19:41:32 +00:00
Daniel Rosenberg
20bf84eca0
Fix overflow in path building am: 6ea6c04
am: 9c44027
am: 4830087
...
am: ad431d2
* commit 'ad431d2e2e15cc47b78fa62e4ab362bfdaa77070':
Fix overflow in path building
Change-Id: Ifa2970afd2862bef780904f2b91a307c16f7a7b8
2016-04-14 19:37:48 +00:00
Daniel Rosenberg
ad431d2e2e
Fix overflow in path building am: 6ea6c04
am: 9c44027
...
am: 4830087
* commit '4830087b3755b4c3498880369ccbe918aa136cd0':
Fix overflow in path building
Change-Id: Ie2044be5b1c31b1fe128c90eda1c5df169dc0a3d
2016-04-14 19:34:33 +00:00
Daniel Rosenberg
4830087b37
Fix overflow in path building am: 6ea6c04
...
am: 9c44027
* commit '9c440272192d600c72659da5bfbe0c2e0a133cfe':
Fix overflow in path building
Change-Id: Idb39dfc88adb854ffbc3bd40be0d28409248fc85
2016-04-14 19:31:17 +00:00
Daniel Rosenberg
9c44027219
Fix overflow in path building
...
am: 6ea6c04
* commit '6ea6c04ca695e0f0b6bcf3ea4529b9fd74fee8e4':
Fix overflow in path building
Change-Id: Ia4388b694ddb12083e0d5a67a3a5f3f5bba2fb12
2016-04-14 19:27:58 +00:00
Daniel Rosenberg
6ea6c04ca6
Fix overflow in path building
...
An incorrect size was causing an unsigned value
to wrap, causing it to write past the end of
the buffer.
Bug: 28085658
Change-Id: Ie9625c729cca024d514ba2880ff97209d435a165
2016-04-13 00:11:52 +00:00
Daniel Rosenberg
2857bd1e44
Add nofail fstab option
...
am: d38e3c5
* commit 'd38e3c522c162972bb348c0258e3f9e975191c4f':
Add nofail fstab option
Change-Id: I3cdf284fe188c4f3874b91d8b77d17157160d68d
2016-04-12 21:08:41 +00:00
Daniel Rosenberg
d38e3c522c
Add nofail fstab option
...
This option allows fs_mgr to ignore mount errors on an optional
partition to allow booting to continue.
Bug: 28071890
Change-Id: I71a2b3c1c573297cab18884b4c4bd7c27ced2901
2016-04-07 20:37:31 -07:00
Josh Gao
0fb3191840
Don\'t demangle symbol names. am: fbbc744
am: 0edda64
...
am: 9bf0b81
* commit '9bf0b815ad6701b6a3813fc1da1ecec61affb18c':
Don't demangle symbol names.
2016-03-23 20:48:58 +00:00
Josh Gao
9bf0b815ad
Don\'t demangle symbol names. am: fbbc744
...
am: 0edda64
* commit '0edda648fb7793c58ff76ceb0c740571b25d16fd':
Don't demangle symbol names.
2016-03-23 20:44:20 +00:00
Josh Gao
0edda648fb
Don\'t demangle symbol names.
...
am: fbbc744
* commit 'fbbc744130c85538a754d245e958d7d79f24309c':
Don't demangle symbol names.
2016-03-23 20:40:48 +00:00
Josh Gao
a06b2e27b3
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
am: 53cacfa
-s ours am: af857f6
am: 44e6cff
am: 7e7a1fb
...
am: 83317d5
* commit '83317d5d74d48f121b6e994aa0baf3a5b567edcb':
Don't demangle symbol names.
2016-03-23 18:50:34 +00:00
Josh Gao
83317d5d74
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
am: 53cacfa
-s ours am: af857f6
am: 44e6cff
...
am: 7e7a1fb
* commit '7e7a1fb6e84b381914b0e315183d2b283c475ea6':
Don't demangle symbol names.
2016-03-23 18:46:41 +00:00
Josh Gao
fbbc744130
Don't demangle symbol names.
...
Bug: http://b/27299236
Change-Id: I26ef47f80d4d6048a316ba51e83365ff65d70439
2016-03-23 11:43:35 -07:00
Josh Gao
7e7a1fb6e8
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
am: 53cacfa
-s ours am: af857f6
...
am: 44e6cff
* commit '44e6cff67ff0902dba5d833805b8902f21597a7f':
Don't demangle symbol names.
2016-03-23 18:42:46 +00:00
Josh Gao
44e6cff67f
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
am: 53cacfa
-s ours
...
am: af857f6
* commit 'af857f6dc8e103d9cd1c6b40c664fb9f65b426ec':
Don't demangle symbol names.
2016-03-23 18:38:52 +00:00
Josh Gao
af857f6dc8
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
...
am: 53cacfa
-s ours
* commit '53cacfa3037ef75b783d72307177a215fc02f070':
Don't demangle symbol names.
2016-03-23 18:34:53 +00:00
Josh Gao
53cacfa303
Merge "Don\'t demangle symbol names." into lmp-dev
...
am: 6914799
* commit '69147994ba50146e1f9c7d98136429057627b4bd':
Don't demangle symbol names.
2016-03-23 18:23:06 +00:00
Josh Gao
69147994ba
Merge "Don't demangle symbol names." into lmp-dev
2016-03-23 18:13:20 +00:00
Josh Gao
5aaafcb939
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours am: 029b787
am: 69a29d1
-s ours am: fa7bff7
am: fe523b9
...
am: e144c6f
* commit 'e144c6fedcb5bc4305dc0e947b6488f458684292':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:18:13 +00:00
Josh Gao
e144c6fedc
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours am: 029b787
am: 69a29d1
-s ours am: fa7bff7
...
am: fe523b9
* commit 'fe523b9bab3fa9e46fdf1210e05003bd3c919437':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:14:09 +00:00
Josh Gao
fe523b9bab
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours am: 029b787
am: 69a29d1
-s ours
...
am: fa7bff7
* commit 'fa7bff765bb5b7d595745fd9dbed7daa56d24bb0':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:10:42 +00:00
Josh Gao
fa7bff765b
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours am: 029b787
...
am: 69a29d1
-s ours
* commit '69a29d169a9775b0acb12457e631fdafe1044eb7':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:07:14 +00:00
Josh Gao
69a29d169a
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours
...
am: 029b787
* commit '029b7874695c7173d6f3d7bf80ce4d2fc46f6fb4':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:03:47 +00:00
Josh Gao
029b787469
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours
...
am: ba1f9d5
-s ours
* commit 'ba1f9d50bdcc282b30bca99c2a4111f0d6fad126':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 00:56:45 +00:00
Josh Gao
ba1f9d50bd
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours
...
am: 908c511
-s ours
* commit '908c511e50c2ed5f69dcafbe82af75d5a090275f':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 00:53:20 +00:00
Josh Gao
908c511e50
Don\'t demangle symbol names. DO NOT MERGE
...
am: a183654
-s ours
* commit 'a183654b820447e6bd9980413e1f7ff5b89f875b':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 00:49:48 +00:00
Josh Gao
7c903fbacf
Don't demangle symbol names.
...
Bug: http://b/27299236
Change-Id: I3a698c6d93e262fd78e743c1e6e946b054b9dcd1
2016-03-22 11:51:36 -07:00
Josh Gao
a183654b82
Don't demangle symbol names. DO NOT MERGE
...
Bug: http://b/27299236
Change-Id: I80524d8d5df9c5abea8c6db8ded965a5dfa3d607
2016-03-22 11:33:28 -07:00
Josh Gao
8e3e7e9f97
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours am: 8a7a944fd3
am: aa0afa65c5
...
am: 77afd98582
* commit '77afd985829024a00aef82f0fb1533a6d4294359':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:28:03 +00:00
Josh Gao
77afd98582
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours am: 8a7a944fd3
...
am: aa0afa65c5
* commit 'aa0afa65c573cbc30ed6afb795b27b12a2f29b31':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:21:02 +00:00
Josh Gao
3ddc5e7d6d
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
am: 92e0f8f49d
am: 65f7b2d616
...
am: f25e2dfd3f
* commit 'f25e2dfd3f441b6cfbee30a18bb5507dee28349a':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:20:48 +00:00
Josh Gao
aa0afa65c5
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours
...
am: 8a7a944fd3
* commit '8a7a944fd399dc7f9475b7cc2e06681516156e39':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:14:53 +00:00
Josh Gao
f25e2dfd3f
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
am: 92e0f8f49d
...
am: 65f7b2d616
* commit '65f7b2d6169a2a61fe1d607ca55e690721faf31a':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:14:05 +00:00
Josh Gao
8a7a944fd3
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
...
am: 512b191d80
-s ours
* commit '512b191d80f01f514789b33d44b64534708ede51':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:06:23 +00:00
Josh Gao
65f7b2d616
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
...
am: 92e0f8f49d
* commit '92e0f8f49d952b365b2be7715a4320d2451d7a67':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:06:23 +00:00
Josh Gao
512b191d80
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours
...
am: 75708e52d3
* commit '75708e52d3cced48b4726e71ac94f17cd013ee98':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:59:29 +00:00
Josh Gao
92e0f8f49d
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
...
am: c663d0482b
* commit 'c663d0482b67d028e5b30dbe5f45ef7da2b3e5de':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:59:21 +00:00