ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26333 commits 1 branch 0 tags 217 MiB
Commit graph

26333 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Salyzyn
26545e3c60 Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed 
am: 809dee506e

Change-Id: I937ac8e0df7bd47f3db292f7acdc11c7946af868
 2016-11-17 15:41:04 +00:00
Mark Salyzyn
809dee506e Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" 
am: 8c41e791ed

Change-Id: Ifbc00285da734859d590153a7c6cfc8e51c014f9
 2016-11-17 15:33:02 +00:00
Mark Salyzyn
8c41e791ed Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" 2016-11-17 15:22:14 +00:00
Daichi Hirono
b2e243be48 Merge "Remove FuseBridgeLoop class." am: 5368723cf3 
am: f5964b5cf9

Change-Id: I83e808886bcc4dc7dc9774ac4e8be10458b46955
 2016-11-17 04:44:23 +00:00
Daichi Hirono
f5964b5cf9 Merge "Remove FuseBridgeLoop class." 
am: 5368723cf3

Change-Id: I0d1c7f9a16a9f170288f9f542e5b485717aa0141
 2016-11-17 04:36:23 +00:00
Treehugger Robot
5368723cf3 Merge "Remove FuseBridgeLoop class." 2016-11-17 04:22:27 +00:00
Wei Wang
a24dde686a Merge changes from topic 'slow_log' am: 2369b1eb80 
am: b00b28ab9c

Change-Id: I70ebf8d1c7ed2f9a5e3be5973aaeec5c229b018c
 2016-11-17 04:03:34 +00:00
Wei Wang
737d0f5265 init: fix undefined behavior in ExecuteCommand am: d67a4abc64 
am: 279f3d593f

Change-Id: I56f463ed8b8af57993c180181a63e84f0a0eb49e
 2016-11-17 04:03:28 +00:00
Wei Wang
67396253f2 Revert "Revert "init: warn slow action"" am: 8b1d526a72 
am: 3567c7c9d9

Change-Id: I65c3e5d7d919ca80e794b731cf8e24b19945df2c
 2016-11-17 04:03:22 +00:00
Wei Wang
b00b28ab9c Merge changes from topic 'slow_log' 
am: 2369b1eb80

Change-Id: Ib714a9e9cd22bca570399604a2b4ea3d6cfe9ed3
 2016-11-17 03:54:58 +00:00
Wei Wang
279f3d593f init: fix undefined behavior in ExecuteCommand 
am: d67a4abc64

Change-Id: I1ecbb1d083af62dd5e69b4cff19ec411016054f3
 2016-11-17 03:54:57 +00:00
Wei Wang
3567c7c9d9 Revert "Revert "init: warn slow action"" 
am: 8b1d526a72

Change-Id: Ie067e37758ae28fece1732ab7697e2a1286594dc
 2016-11-17 03:54:51 +00:00
Wei Wang
2369b1eb80 Merge changes from topic 'slow_log' 
* changes:
  init: fix undefined behavior in ExecuteCommand
  Revert "Revert "init: warn slow action""
 2016-11-17 03:46:44 +00:00
Daichi Hirono
ac982d2644 Merge "Stops the loop when all files are closed." am: d8d7fc6717 
am: 920b02906f

Change-Id: If2d271322d717b2fc530dcc11d7b341d886f1212
 2016-11-17 03:06:38 +00:00
Daichi Hirono
920b02906f Merge "Stops the loop when all files are closed." 
am: d8d7fc6717

Change-Id: If42cde1e5e4026915e5bc2e773ac6ff46aa9a8d9
 2016-11-17 02:58:37 +00:00
Treehugger Robot
d8d7fc6717 Merge "Stops the loop when all files are closed." 2016-11-17 02:49:05 +00:00
Daichi Hirono
691739b334 Remove FuseBridgeLoop class. 
Bug: 32779923
Test: libappfuse_test
Change-Id: I29a76701d141ae061ec1fe32993d27460a0c694a
 2016-11-17 09:49:51 +09:00
Daichi Hirono
30e6808895 Stops the loop when all files are closed. 
The CL changes FuseBridgeLoop so that it exits when all files opened on
the AppFuse mount point are closed. Note that the client code will
unmount the FUSE mount point after the loop exits.

Bug: 32260320
Test: libappfuse_test
Change-Id: I4965fbb48de8a280c6306e70757a07376b1956a7
 2016-11-17 09:10:53 +09:00
Mark Salyzyn
52bd37e633 libcutils: move cutils/files.h to cutils/android_get_control_file.h 
files.[h|cpp] is bound to be abused with junk, replace with
android_get_control_file.[h|cpp]. Plus some sundry cleanup.

Test: gTest libcutils-tests, logd-unit-tests, liblog-unit-tests,
      logcat-unit-tests and init_tests
Bug: 32450474
Change-Id: Ibd4a7aa4624ea19a43d1f98a3c71ac37805d36b5
 2016-11-16 15:56:56 -08:00
Wei Wang
d67a4abc64 init: fix undefined behavior in ExecuteCommand 
ExecuteCommand may change command_ vector which leads undefined behavior
This bug is found when adding logs in ExecuteCommand printing our Command class fields

Bug: 32838381
Test: on emulator
Change-Id: I96468bd2192ca80013871a3a6ac4132149363fff
 2016-11-16 15:46:19 -08:00
Josh Gao
c98fa1a51c Merge "adb: add sysdeps/chrono.h for chrono literals on Win32." am: e631e470e0 
am: 27bbe8bfb2

Change-Id: Ib5069a8811f8c5e4b21cc849f9e57c4c4d488276
 2016-11-16 22:37:29 +00:00
Josh Gao
27bbe8bfb2 Merge "adb: add sysdeps/chrono.h for chrono literals on Win32." 
am: e631e470e0

Change-Id: Ie62e995d9790bf7539f3f9fca05de7b4b359dc7c
 2016-11-16 22:29:30 +00:00
Jeff Sharkey
dd8f40625d Merge "Only restorecon CE storage after unlocked." am: cfd12251bd 
am: a4f66b6623

Change-Id: Ibfcd9cd102fd6cf46f795865a1dc3259471eff78
 2016-11-16 22:22:29 +00:00
Treehugger Robot
e631e470e0 Merge "adb: add sysdeps/chrono.h for chrono literals on Win32." 2016-11-16 22:21:41 +00:00
Jeff Sharkey
a4f66b6623 Merge "Only restorecon CE storage after unlocked." 
am: cfd12251bd

Change-Id: If1774db6602436c7c35c72a758155df5c59481cb
 2016-11-16 22:14:29 +00:00
Treehugger Robot
cfd12251bd Merge "Only restorecon CE storage after unlocked." 2016-11-16 22:04:50 +00:00
Jeff Sharkey
d1d3bdd16f Only restorecon CE storage after unlocked. 
On FBE devices, the filenames inside credential-encrypted directories
are mangled until the key is installed.  This means the initial
restorecon at boot needs to skip these directories until the keys
are installed.

This CL changes the implementation of the "restorecon_recursive"
built-in command to use the new SKIPCE flag to avoid labeling files
in CE directories.  vold will request a restorecon when the keys
are actually installed.

(cherrypicked from commit 1635afe83d)

Bug: 30126557
Test: Cherry-picked from master
Change-Id: I320584574a4d712c493b5bbd8a79b56c0c04aa58
 2016-11-16 21:19:17 +00:00
Elliott Hughes
bd51a0d30d Merge "Switch adb over to <chrono>." am: 59826ddee5 
am: 2278b50f24

Change-Id: I91e3f9d5784d3c7110a605115b247f71f68d6fe3
 2016-11-16 20:21:51 +00:00
Josh Gao
4602adbcd3 adb: add sysdeps/chrono.h for chrono literals on Win32. 
Bug: http://b/32878766
Test: mma
Change-Id: Iaa89d4eadf07e63d6d7205057435a6c7fb5d4ec5
 2016-11-16 12:14:59 -08:00
Elliott Hughes
2278b50f24 Merge "Switch adb over to <chrono>." 
am: 59826ddee5

Change-Id: I673ce3c9f4a104df3197ec7120a126155e18918e
 2016-11-16 20:14:20 +00:00
Treehugger Robot
59826ddee5 Merge "Switch adb over to <chrono>." 2016-11-16 20:05:52 +00:00
Elliott Hughes
dbe91eee26 Switch adb over to <chrono>. 
Clearer code, and lets us lose some more portability cruft.

Bug: http://b/32878766
Test: manual
Change-Id: Ie44928bbf8d68a74127aaf76e7e0060e25fa2cc8
 2016-11-16 09:12:12 -08:00
Daichi Hirono
5f7ed2dd60 Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." am: 0673412bb9 
am: 357876455c

Change-Id: I242c3f8f7e65c78446bb145db6035e28287cd917
 2016-11-16 08:02:24 +00:00
Wei Wang
8b1d526a72 Revert "Revert "init: warn slow action"" 
This reverts commit 1802d11cc7.

Test: grep init log
Bug: 32712851
 2016-11-15 23:58:55 -08:00
Daichi Hirono
357876455c Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." 
am: 0673412bb9

Change-Id: I85e6be67fdd5285c2abc26a097301c7136a676f9
 2016-11-16 07:54:10 +00:00
Treehugger Robot
0673412bb9 Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT." 2016-11-16 07:46:44 +00:00
Tao Bao
11c19d9b15 Merge "Update to new minui text API" am: 335502453d -s ours 
am: b6a8454cd5

Change-Id: I29a733b45b7393854363b4d3cf82462bad04dbf0
 2016-11-16 07:08:45 +00:00
Tao Bao
b6a8454cd5 Merge "Update to new minui text API" 
am: 335502453d  -s ours

Change-Id: Iebbb0870b47a14b1636f2809f8c8940bf665d19f
 2016-11-16 07:00:47 +00:00
Tao Bao
335502453d Merge "Update to new minui text API" 2016-11-16 05:52:18 +00:00
Daichi Hirono
401f8b6935 Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available." am: c884f80755 
am: c0a79ff4cf

Change-Id: Ie4d71460a86e8504cf32a65b143d8d7a32248cca
 2016-11-16 04:17:55 +00:00
Daichi Hirono
c0a79ff4cf Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available." 
am: c884f80755

Change-Id: I6faf8eb8c92f3eced1493eba0d3fe61834914c97
 2016-11-16 04:09:53 +00:00
Treehugger Robot
c884f80755 Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available." 2016-11-16 03:57:46 +00:00
Ting-Yuan Huang
fde3b5b95a Merge "init: fix memory leaks" am: a73ba879b1 
am: 1700a162d5

Change-Id: I94dd82e6b7dd9dcb4ebd247d553013dd7e5f98db
 2016-11-16 03:39:37 +00:00
Ting-Yuan Huang
1700a162d5 Merge "init: fix memory leaks" 
am: a73ba879b1

Change-Id: I3375372ddc23b7440edab0107ff1cbe34d550865
 2016-11-16 03:32:40 +00:00
Treehugger Robot
a73ba879b1 Merge "init: fix memory leaks" 2016-11-16 03:25:34 +00:00
Ting-Yuan Huang
7fef2a4b20 Merge "toolbox: fix memory leak" am: e3bd4a2fec 
am: 32bf66a168

Change-Id: I0d6d94fdfb7f7484eb7e6ea39a1d38bf8ce4a88a
 2016-11-16 03:25:21 +00:00
Ting-Yuan Huang
32bf66a168 Merge "toolbox: fix memory leak" 
am: e3bd4a2fec

Change-Id: I1c3d0e7308acf2af333b9a41a73b2a4120a3cc0b
 2016-11-16 03:17:20 +00:00
Treehugger Robot
e3bd4a2fec Merge "toolbox: fix memory leak" 2016-11-16 03:10:38 +00:00
Daichi Hirono
16d0b426a3 Use FUSE_COMPAT_22_INIT_OUT_SIZE always as the resopnse size of FUSE_INIT. 
We return the minor version number 15 to FUSE_INIT since we don't handle
BATCH_FORGET. Thus the kernel does not accept the latest size of
fuse_init_out. Instead we need to use FUSE_COMPAT_22_INIT_OUT_SIZE.

Previously the code unintentionally used FUSE_COMPAT_22_INIT_OUT_SIZE always
because we override the minor version out->minor to 15. Because sdcard.c shares
the buffer for |in| and |out|, it overrides the version number of in->minnor as
well.

The if closure in the previous code "if (in->minor <= 22)" was always true. The
CL removes the if closure to explicitly use FUSE_COMPAT_22_INIT_OUT_SIZE always.

Bug: 32779923
Test: Manually boot Android and check if the storage shows up in Settings app.
Change-Id: Ibbc50da7fb82be148acfc5f1a3d46fefbe211f9d
 2016-11-16 01:58:28 +00:00
Daichi Hirono
471ad6a59d Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available. 
We return the minor version number 15 to FUSE_INIT since we don't handle
BATCH_FORGET. Thus the kernel does not accept the latest size of
fuse_init_out. Instead we need to use FUSE_COMPAT_22_INIT_OUT_SIZE.

Bug: 32779923
Test: libappfuse_test

Change-Id: I5c979d0e45344ca8adfe3ad3f4a9561442abcb3a
 2016-11-16 01:56:00 +00:00