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

26312 Commits

Author SHA1 Message Date
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
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
Ting-Yuan Huang 09bd41d097 init: fix memory leaks 
It's possible that node is not freed before return.

Test: make WITH_TIDY=1 mmma system/core/init

Change-Id: I648eea9dda006d2b2239e169785190817ad31352
 2016-11-15 16:55:50 -08:00
Mark Salyzyn f8768b6402 Merge "liblog: logprint: report truncated event log contents if error" am: 9258348219 
am: 4a9419f627

Change-Id: I9313e192f43a475ebc57ef943d4c01274fc0f785
 2016-11-16 00:32:59 +00:00
Ting-Yuan Huang 58da81d987 toolbox: fix memory leak 
free img

Test: make WITH_TIDY=1 mmma system/core/toolbox
Change-Id: I2f8feff0eddca763ee4e7fc9867480af60c8a911
 2016-11-15 16:27:03 -08:00
Mark Salyzyn 4a9419f627 Merge "liblog: logprint: report truncated event log contents if error" 
am: 9258348219

Change-Id: I8b49452b92a65f5cf1cf92ec1d3b776d954243a6
 2016-11-16 00:26:00 +00:00
Mark Salyzyn 9258348219 Merge "liblog: logprint: report truncated event log contents if error" 2016-11-16 00:18:02 +00:00
Mark Salyzyn 1a57ae3a7d liblog: logprint: report truncated event log contents if error 
We need to accept that a log tag can contain no payload.  For those
that are corrupted, and to aid debugging, report what we did manage
to interpret.  Report last character as a ! for corruption, and ^
for truncation.  Fix a few Android Coding standard issues.

Test: gTest logcat-unit-tests
Bug: 32903864
Change-Id: Id11bef3a7b6569305c51701dd66c45d2038d6628
 2016-11-15 14:46:34 -08:00
Damien Bargiacchi 329c60458b Update to new minui text API 
Change-Id: Ic753564a397b90a9ba54660c78bec9c1a1ef583d
(cherry picked from commit 0ee524de68)
 2016-11-15 14:25:44 -08:00
Tao Bao 9b1b0627b9 Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." am: 787482ecd9 
am: af2a8858c4

Change-Id: I2cc4cf5e95bb624b8cef6ebde3852fb975f7cbca
 2016-11-15 22:18:49 +00:00
Tao Bao af2a8858c4 Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." 
am: 787482ecd9

Change-Id: Icdce4207cb64e084e200b6f7f8ae194831d5c4f0
 2016-11-15 22:11:21 +00:00
Tao Bao 787482ecd9 Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." 2016-11-15 22:00:47 +00:00
Tao Bao a456c21348 ziparchive: Allow ExtractEntryToFile() to work with block device. 
FileWriter::Create() calls ftruncate(2) to truncate the destination
file, which doesn't work with FD that references a block device. It
leads to kIoError when calling ExtractEntryToFile() to extract an entry
to block device FD.

As a result, it fails the package_extract_file() command in OTA updates
(e.g. 'package_extract_file("boot.img",
"/dev/block/platform/soc.0/f9824900.sdhci/by-name/boot")').

This CL skips the call to ftruncate(2) if FD references a block device.

Bug: 32903624
Test: ziparchive-tests works.
Test: Build an OTA updater (m updater) and call package_extract_file().

Change-Id: Ia81116f1a8d7cab802396bdc32c6096b4cb56a3c
 2016-11-15 10:19:04 -08:00
Elliott Hughes 74c997ffda Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." am: f3e731b3c5 
am: 3ee9807554

Change-Id: I38158643aac35663d96a5e6760bbd217cda955ca
 2016-11-15 18:17:16 +00:00
Elliott Hughes 3ee9807554 Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." 
am: f3e731b3c5

Change-Id: I2028bb8835c5e55e1bf8c88c3395253ded9d66d3
 2016-11-15 18:09:46 +00:00
Elliott Hughes f3e731b3c5 Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for." 2016-11-15 18:02:30 +00:00
Wei Wang 8256062afc Merge "init: fix BuildTriggersString for empty string" am: 9b1d5e15ef 
am: 4286801ccb

Change-Id: I6744e47cc9e85f86217d0c6ecc96e6011e82d99a
 2016-11-15 17:39:45 +00:00
Wei Wang 4286801ccb Merge "init: fix BuildTriggersString for empty string" 
am: 9b1d5e15ef

Change-Id: Ia344bac744e767ab26d7811ceb2806cce5f28a60
 2016-11-15 17:32:13 +00:00
Treehugger Robot 9b1d5e15ef Merge "init: fix BuildTriggersString for empty string" 2016-11-15 17:23:56 +00:00
Nick Desaulniers 6133e64575 Merge "Revert "init: warn slow action"" am: 431c489568 
am: ea516950fb

Change-Id: I0839b87695043ce0efbf921ffd94364091991b65
 2016-11-15 07:12:41 +00:00
Nick Desaulniers ea516950fb Merge "Revert "init: warn slow action"" 
am: 431c489568

Change-Id: I570911d0940fa6819de6f07e0d88cfadbfb6bdd1
 2016-11-15 07:05:12 +00:00
Treehugger Robot 431c489568 Merge "Revert "init: warn slow action"" 2016-11-15 06:58:53 +00:00
Daichi Hirono f5cab9d7f1 Merge "Add static assert to check if FuseBuffer is standard layout union." am: a0967504f9 
am: 83e2cfdf52

Change-Id: I29b3ee5ee30317493513cb4e218330cdeb98afe2
 2016-11-15 06:04:08 +00:00