openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,755 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

14755 Commits

Author SHA1 Message Date
Josh Gao 57b4b422e3 DO NOT MERGE: adb: use asocket\\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours am: f5592e174e 
am: d99c745c31

Change-Id: I1b615a3910580ae7f78b038b18b969c196fabe1e
 2016-06-22 18:18:37 +00:00
Josh Gao d99c745c31 DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 am: 8ec6f5b46f -s ours 
am: f5592e174e

Change-Id: Ib220d4a778ea4e7bda44aafbbaa4911c243d7db7
 2016-06-22 18:15:59 +00:00
Josh Gao f5592e174e DO NOT MERGE: adb: use asocket\\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f am: 05d5db2534 
am: 8ec6f5b46f  -s ours

Change-Id: If7256035b8844a6567080b5caf769a0a4f567d2f
 2016-06-22 18:11:17 +00:00
Josh Gao 8ec6f5b46f DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 83cb3032d2 -s ours am: 420aa30c9f 
am: 05d5db2534

Change-Id: I433e885416a6cbf93bc701cfebc046f78a7af7dd
 2016-06-22 18:07:06 +00:00
Josh Gao 05d5db2534 DO NOT MERGE: adb: use asocket\\'s close function when closing. am: 83cb3032d2 -s ours 
am: 420aa30c9f

Change-Id: I779b0b79ce268561f4a686d6e98c131707464ecf
 2016-06-22 18:01:40 +00:00
Josh Gao 420aa30c9f DO NOT MERGE: adb: use asocket\'s close function when closing. 
am: 83cb3032d2  -s ours

Change-Id: I357c754fe2bc3fdf4f050c26aace2bea4c6569c2
 2016-06-22 17:58:51 +00:00
Josh Gao 83cb3032d2 DO NOT MERGE: adb: use asocket's close function when closing. 
close_all_sockets was assuming that all registered local sockets used
local_socket_close as their close function. However, this is not true
for JDWP sockets.

Backport of 53eb31d8 and 9b587de.

Bug: http://b/28347842
Change-Id: I05e071b3d5c7e55c7a59400c5c9bb0635eeef29f
 2016-06-21 16:28:29 -07:00
Elliott Hughes 5538f8bb63 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 am: 20b1e79563 
am: c443a447b2

* commit 'c443a447b2f6e950b03fe472c5f7cb6c54e9ba61':
  Fix scanf %s in lsof.

Change-Id: Ia66e81641532cf7bca669fb52095aeca90158807
 2016-05-24 23:08:36 +00:00
Elliott Hughes c443a447b2 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 
am: 20b1e79563

* commit '20b1e795637686d3a18c79413cccbba16881e295':
  Fix scanf %s in lsof.

Change-Id: Ic63528dee82e3045020b527c093b9b4fffaf5530
 2016-05-24 23:05:55 +00:00
Elliott Hughes 20b1e79563 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 
am: a17f2802b1

* commit 'a17f2802b153b2ee361fea9a6cc37da0613a2e55':
  Fix scanf %s in lsof.

Change-Id: I088944d9c376de58705698bfe7d417a10c708909
 2016-05-24 23:02:26 +00:00
Elliott Hughes a17f2802b1 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee 
am: ad0c2bf5f3

* commit 'ad0c2bf5f345a4cdb53a3e4f690db842e8df1685':
  Fix scanf %s in lsof.

Change-Id: I51f630de4cb5ce667ac856a1848206c368816aea
 2016-05-24 22:59:18 +00:00
Elliott Hughes ad0c2bf5f3 resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 
am: 1a98776aee

* commit '1a98776aee4d02c33d922bbbe3ffdd54099840a9':
  Fix scanf %s in lsof.

Change-Id: I1af0d93d03631f257b1372a08aad158508f652ea
 2016-05-24 22:56:38 +00:00
Elliott Hughes 1a98776aee resolve merge conflicts of 7f5da85 to lmp-dev 
am: de529e72b6

* commit 'de529e72b63c135053711ceb27a043f8d80e308c':
  Fix scanf %s in lsof.

Change-Id: I4dc617bbe052059b04296e4213fb778fbf3cf8eb
 2016-05-24 22:53:55 +00:00
Elliott Hughes de529e72b6 resolve merge conflicts of 7f5da85 to lmp-dev 
Change-Id: I7a7547426a229ac99d187ec8bfabd49c4da51907
 2016-05-24 15:23:48 -07:00
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 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 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 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 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 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 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 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 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 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