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

21946 Commits

Author SHA1 Message Date
Josh Gao 22cbf62602 adb: don\'t dup local socket fd. 
am: 42afe2033f

Change-Id: I4499180c294a79a12d7bcacbc3d41466037570f0
 2016-06-23 01:08:03 +00:00
Josh Gao 42afe2033f adb: don't dup local socket fd. 
SIGHUP handling depends on the local socket fd being fully closed in
order to trigger an event on its counterpart. Release the local socket
fd inside of Subprocess when returning it to ensure this.

Bug: http://b/29565233
Change-Id: I13b17bcddf0b396a5f4880f9e410fbbf24d9370d
 2016-06-22 15:57:12 -07:00
Josh Gao a2884315f4 DO NOT MERGE: adb: use asocket\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79 -s ours 
am: 2dff6490fd

Change-Id: Ibae7110f3e755d504771227c23cd3615c3984b80
 2016-06-22 18:36:36 +00:00
Josh Gao 2dff6490fd DO NOT MERGE: adb: use asocket\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 
am: 46104a0d79  -s ours

Change-Id: If33739a6317a8ad6f008960a5726dc6e2ce7c18c
 2016-06-22 18:33:53 +00:00
Josh Gao 46104a0d79 DO NOT MERGE: adb: use asocket\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 am: 57f5c95376 
am: 755ab3ed16

Change-Id: I43718396c291ac9cb261097f7a34cfa7c1fa3725
 2016-06-22 18:31:11 +00:00
Josh Gao 755ab3ed16 DO NOT MERGE: adb: use asocket\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours am: d389f5d186 
am: 57f5c95376

Change-Id: Ib68980c2897ba668691c76989375a5382bc8af3f
 2016-06-22 18:26:13 +00:00
Josh Gao 9d35b1e07e 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 am: 57b4b422e3 am: 96dea5690a -s ours 
am: 2a9f4e1c50

Change-Id: Ib8bcf35186fd28c506bd3d269fd90dfb76556bf2
 2016-06-22 18:26:12 +00:00
Josh Gao 2a9f4e1c50 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 am: 57b4b422e3 
am: 96dea5690a  -s ours

Change-Id: Icef5dce2b992030b3cee1269e2e46992bd063537
 2016-06-22 18:23:51 +00:00
Josh Gao 57f5c95376 DO NOT MERGE: adb: use asocket\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207 -s ours 
am: d389f5d186

Change-Id: I5c106da4673571bc24e17742ab62960333507f77
 2016-06-22 18:23:41 +00:00
Josh Gao d389f5d186 DO NOT MERGE: adb: use asocket\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 am: dc6e14f219 
am: fdf3112207  -s ours

Change-Id: I42711a1a41b8099df1b769eb1c4e1fbbd2ee78bf
 2016-06-22 18:21:33 +00:00
Josh Gao 96dea5690a 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 
am: 57b4b422e3

Change-Id: I14d98d1df800f6197c5eb28a45bd9fe259c844bf
 2016-06-22 18:21:11 +00:00
Josh Gao fdf3112207 DO NOT MERGE: adb: use asocket\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours am: fb9747c411 
am: dc6e14f219

Change-Id: Iac5c5b2bb07505cde1638f42d5e1ae6566a88c0b
 2016-06-22 18:19:09 +00:00
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 dc6e14f219 DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours am: 45a4bca09d -s ours 
am: fb9747c411

Change-Id: Ife4804a27b044aebaaefda6626adb61c241812af
 2016-06-22 18:16:21 +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 fb9747c411 DO NOT MERGE: adb: use asocket\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9 -s ours 
am: 45a4bca09d  -s ours

Change-Id: I2124ed25893de9910be435ba68619dfc00e66239
 2016-06-22 18:11:44 +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 45a4bca09d DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 
am: a3d96cfec9  -s ours

Change-Id: I4ca0f2890519c3450a15edab989ca424b6bb10ae
 2016-06-22 18:07:24 +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 a3d96cfec9 DO NOT MERGE: adb: use asocket\\'s close function when closing. am: 5218ad36ad 
am: d7e24ec999

Change-Id: I9ca9e7e857de9e9679169cd7239f9e54a3d98dd2
 2016-06-22 18:02:25 +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 d7e24ec999 DO NOT MERGE: adb: use asocket\'s close function when closing. 
am: 5218ad36ad

Change-Id: Ibc9ee3b566d34847f4e1e02413890449750ba2f5
 2016-06-22 17:59:18 +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
Christopher Ferris 3394cd7c3c Merge "Add support to indicate bitness of public library." into nyc-mr1-dev 2016-06-22 17:56:50 +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
Josh Gao 5218ad36ad 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: I13ec6fd87a0691c72608baf6038adcc0f03dca9f
 2016-06-21 16:28:21 -07:00
Christopher Ferris 6664a805ca Add support to indicate bitness of public library. 
For public vendor libraries, a vendor might have only a 32 bit
or only a 64 bit version of the library. Add a way to indicate this
in the public.libraries.txt files. The new format is:

  library.so 32

This indicates that this is a 32 bit only public library.

  library.so 64

This indicates that this is a 64 bit only public library.

Bug: 29370721
Bug: 29512261
Change-Id: I26b14893d104a9e1f62914663d8c972cd4d55e1e
 2016-06-21 16:11:23 -07:00
Courtney Goeltzenleuchter bf8132a7c1 Add color mode enums 
The android_color_mode_t defines the color modes supported
by a display. A display can support multiple different
color modes.

sRGB mode and AdobeRGB are deliberately placed at 7 and 8
so that they match mode ID's used on prior devices.

bug: http://b/27926012
Change-Id: I9ab41b56ec0b495c02539665da5be158ffddf843
 2016-06-21 14:47:23 -06:00
Josh Gao 9150b1288e adb: fix fd double close, Subprocess lifetime issue. 
am: 69d2f98197

Change-Id: I7797d5dee022bfdd6f165221340095f7836eea99
 2016-06-20 23:48:01 +00:00
Josh Gao 69d2f98197 adb: fix fd double close, Subprocess lifetime issue. 
This commit fixes two somewhat related issues in shell_service.

  - The fd returned by StartSubprocess is owned by a unique_fd
    contained in the Subprocess object, but also gets closed by the
    caller. Resolve this by duping the returned file descriptor.

  - A Subprocess object can be destroyed immediately after its initial
    construction in StartSubprocess if we're sufficiently unlucky.
    Split up the fork/exec and "start management thread" steps, so that
    we can safely do everything we need to do on the Subprocess before
    handing it over to the thread that'll eventually destroy it.

Also includes squashed patches from AOSP master that allow for use of
unique_fd inside adb.

Bug: http://b/29254462
Change-Id: Id9cf0b7e7a7293bee7176919edc758597691c636
(cherry picked from commit c0e6e40cc9)
(cherry picked from commit 54c72aaccc)
(cherry picked from commit 2c5d1d7cd9)
(cherry picked from commit 2a7b86337f)
(cherry picked from commit 13ea01db45)
(cherry picked from commit 344778da41)
 2016-06-20 14:51:05 -07:00
Sami Tolvanen 9af867e7bd fs_mgr_verity: fix verity_update_state for A/B devices 
Use the correct device name when system is mounted as root, and
validate dm-verity status to avoid confusing it with dm-linear.

Bug: 29277442
Change-Id: I36e115189f9a9430bad4bf89f26a376bcb8e8168
 2016-06-17 17:17:04 -07:00
Alex Light d9ff210e63 Fix issue where non-AB-ota devices will cause flashall to fail. 
We now check that a device has slots before trying to get the name of
any of them.

Bug: 29278988

Change-Id: I50f3596e467afae20177ce4e458e697435223c51
 2016-06-16 15:22:22 -07:00
Ruchi Kandoi 13cf49d8eb Merge \"logd: logcat -L takes longer causing vold to timeout.\" into nyc-dev 
am: b02819e2af

Change-Id: I0c0fe46e74bfa4e3461454d62b14f98a4f71be96
 2016-06-16 17:57:48 +00:00
Ruchi Kandoi b02819e2af Merge "logd: logcat -L takes longer causing vold to timeout." into nyc-dev 2016-06-16 17:44:30 +00:00
TreeHugger Robot a3ffde1402 Merge "Make fastboot flash 'B' partitions automatically." into nyc-mr1-dev 2016-06-15 23:09:26 +00:00
Alex Light 6c60ea8c45 Make fastboot flash 'B' partitions automatically. 
Also add ability to specify --slot active to suppress this behavior.

Bug: 29278988

Change-Id: I3ff184be74f9e2d1cb3abc80bd206b4b9faf8a35
 2016-06-15 14:42:22 -07:00
Sami Tolvanen 998f50749e Revert \"logd: enforce policy integrity\" 
am: a742d10277

Change-Id: Idb721b2ff7a57643b671b3d87cb09bb96f1ad465
 2016-06-14 22:28:26 +00:00
Ruchi Kandoi c1b26acae2 logd: logcat -L takes longer causing vold to timeout. 
Temporary fix to prevent device from getting stuck at boot.

Bug: 28788401
Change-Id: Ie4246fc3c9eb7a3af2cb909546811c85997515da
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2016-06-14 15:26:30 -07:00
Dan Stoza c873d44942 Merge "add android_flex_layout for describing all flexible formats." into nyc-mr1-dev 2016-06-14 19:59:38 +00:00
Sami Tolvanen a742d10277 Revert "logd: enforce policy integrity" 
This reverts commit 0bdad0f231.

Bug: 26902605
Change-Id: I6ce8fa7bef63c45821628265c379970eb64963a2
 2016-06-14 11:14:51 -07:00
Pablo Ceballos 0398ec6326 Merge "Header changes for getFrameTimestamps" into nyc-mr1-dev 2016-06-09 21:10:16 +00:00
Felipe Leme 542fc21d29 Merge \"Redirect bugreport stderr to host\'s stderr.\" into nyc-dev 
am: 6d349051ce

Change-Id: I78041cfac6374eb5f2e0ec3478703f7cb03d8623
 2016-06-08 23:41:23 +00:00
TreeHugger Robot 6d349051ce Merge "Redirect bugreport stderr to host's stderr." into nyc-dev 2016-06-08 23:35:12 +00:00
Felipe Leme d1dd125bc2 Redirect bugreport stderr to host's stderr. 
Change-Id: I46f474f0b0d5cacdc4b129eab1bb0a7f52ccece0
Fixes: 29161586
 2016-06-08 11:09:34 -07:00
Elliott Hughes 2e579ca920 Allow multiple (sequential) adb users on Linux. 
am: 75f42d7ea7

Change-Id: I5567c186e9b855ad10d678ac4e212f6948960a08
 2016-06-08 17:09:06 +00:00
Elliott Hughes 75f42d7ea7 Allow multiple (sequential) adb users on Linux. 
Before this, adb will fail to start for the second user who tries because
/tmp/adb.log already exists and isn't writable by the second user.

Also allow $TMPDIR to override the use of /tmp.

Bug: http://b/29201686
Bug: https://code.google.com/p/android/issues/detail?id=211420

(cherry picked from commit d89a6c2285)

Change-Id: Ibb1369e8043feb9774593e317dcd7bb93323fd89
 2016-06-08 08:36:19 -07:00
Sami Tolvanen d6f5af35d5 Merge "fs_mgr: validate corrected signatures" into nyc-dev 
am: eacbb824c9

* commit 'eacbb824c9ee2ccec9e1de641d03e7370888eabc':
  fs_mgr: validate corrected signatures

Change-Id: I3986a59d498a22769611216f5ed475f31332b2c9
 2016-06-07 00:05:41 +00:00
Sami Tolvanen eacbb824c9 Merge "fs_mgr: validate corrected signatures" into nyc-dev 2016-06-07 00:01:56 +00:00
Tao Bao f9b7f7fdba Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev 2016-06-06 23:43:29 +00:00
David Pursell f6d0da2b69 adbd: properly close subprocess pipes on Ctrl+C. 
am: a6d5661140

* commit 'a6d56611404f2e1c0c9f4ab7c8471af0e80b2026':
  adbd: properly close subprocess pipes on Ctrl+C.

Change-Id: I96c1fb2036a58702b23f606bb1e6a27f924324eb
 2016-06-06 23:18:58 +00:00