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

33099 Commits

Author SHA1 Message Date
Keun-young Park 9483be8a00 Merge "combine wait for exec log with service exit log" am: 483d2f9a59 am: 010efc6a1c am: b85523e64e 
am: 58689cb421

Change-Id: If8e7055ef4f98c256a30d0719bcb157af0010e85
 2017-04-28 20:55:13 +00:00
Mark Salyzyn 2bd06f2895 logd: CTS test 
Utilize logd-unit-tests as a CTS test

Goal is to check if the kernel logger is enabled.

Test: run cts tests
Bug: 31772697
Change-Id: I6d80350f3e40aff095f81b6600c40dd7d376bd74
 2017-04-28 13:50:56 -07:00
Keun-young Park 58689cb421 Merge "combine wait for exec log with service exit log" am: 483d2f9a59 am: 010efc6a1c 
am: b85523e64e

Change-Id: If4e052913653de1feebde4799d19c282255f5ede
 2017-04-28 20:40:13 +00:00
Keun-young Park b85523e64e Merge "combine wait for exec log with service exit log" am: 483d2f9a59 
am: 010efc6a1c

Change-Id: Ia3f892e87ee0d08607a472db36b788da81987107
 2017-04-28 20:30:02 +00:00
Keun-young Park 010efc6a1c Merge "combine wait for exec log with service exit log" 
am: 483d2f9a59

Change-Id: I58622d8a76f6f9ecc5df5bb421a4c6af6b72b41a
 2017-04-28 20:25:31 +00:00
Keun-young Park 483d2f9a59 Merge "combine wait for exec log with service exit log" 2017-04-28 20:12:00 +00:00
Josh Gao ae29339ca1 base: make boot_clock work on host linux, hide it on non-linux. 
boot_clock was previously returning zero on any platform that doesn't
define __ANDROID__, including host bionic. Instead of returning a bogus
value, just hide it on non-Linux platforms.

Bug: http://b/37758947
Test: libbase_test32/64 on linux
Change-Id: I96e1d8b92dc44c6308408900cf0d27e1e7db5569
 2017-04-28 13:00:00 -07:00
Jocelyn Bohr c9a8f9fb98 Merge changes I5b1a1ce0,I483a18f9 am: 9349b72a67 am: 4cd2da28ff am: 1bd50f6a98 
am: db1accde79

Change-Id: Iaf1746ae2e35373b9fb04b8d8699690aa7be62b6
 2017-04-28 19:21:27 +00:00
Jocelyn Bohr db1accde79 Merge changes I5b1a1ce0,I483a18f9 am: 9349b72a67 am: 4cd2da28ff 
am: 1bd50f6a98

Change-Id: Ifeb41c75fcb63be27e96a40593a479c891b36d60
 2017-04-28 18:56:58 +00:00
Jocelyn Bohr 1bd50f6a98 Merge changes I5b1a1ce0,I483a18f9 am: 9349b72a67 
am: 4cd2da28ff

Change-Id: I20d78191cdd4fd185a62fcfd348385feb67e2b7a
 2017-04-28 18:43:56 +00:00
Jocelyn Bohr 4cd2da28ff Merge changes I5b1a1ce0,I483a18f9 
am: 9349b72a67

Change-Id: Ia2a70526d7fd97a45d62f896f6e3888c9df3e982
 2017-04-28 18:42:27 +00:00
Treehugger Robot 9349b72a67 Merge changes I5b1a1ce0,I483a18f9 
* changes:
  fastboot: Add 'get_staged' command
  fastboot: Add 'stage' command
 2017-04-28 18:34:08 +00:00
Keun-young Park 4de31e1481 combine wait for exec log with service exit log 
- allows easier tracking of wait time from monitoring tools
- this change also reduces unnecessary log spam
- service exit log looks like this:
  init: Service 'exec 4 (/system/bin/otapreopt_slot)' (pid 611) exited with status 0 waiting took 0.060771 seconds

bug: 37752410
Test: reboot and check log
Change-Id: I122902538697f33939eede548e39f155ec419e03
 2017-04-28 11:20:12 -07:00
Paul Lawrence 2bf87eebe4 Enable metadata encryption 
Bug: 26778031
Test: Boots, reboots, sector 0 of userdata encrypted
      Make sure an FDE device, both default and password protected,
      boots.
      Make sure an FBE device without metadata encryption boots.
Change-Id: I55135f2d81002f4010a857c021ee840f792f7917
 2017-04-28 17:26:30 +00:00
Abodunrinwa Toki 7716d5f969 Merge "Initialize textclassifier model update directory" into oc-dev am: 49f9b4c0d0 -s ours 
am: 76018921ae  -s ours

Change-Id: I3d460ec2b47440eae170ab82a261985a6be56ed3
 2017-04-28 15:39:59 +00:00
Josh Gao 87e7c31187 debuggerd_handler: don't assume that abort message implies fatal. am: 5fd02a8dbc 
am: cc94c5d57d

Change-Id: I2db451cba9f8f6b8999c1b52a5e5636e69e0afb2
 2017-04-28 15:39:43 +00:00
Abodunrinwa Toki 76018921ae Merge "Initialize textclassifier model update directory" into oc-dev 
am: 49f9b4c0d0  -s ours

Change-Id: Ie1d26e840f0f6ce0f488ec122dbe854c22fd9a3b
 2017-04-28 15:36:30 +00:00
Josh Gao cc94c5d57d debuggerd_handler: don't assume that abort message implies fatal. 
am: 5fd02a8dbc

Change-Id: I426314424bf79266b9550641166b53c1dffcbf55
 2017-04-28 15:36:12 +00:00
Abodunrinwa Toki 49f9b4c0d0 Merge "Initialize textclassifier model update directory" into oc-dev 2017-04-28 15:31:05 +00:00
Bowgo Tsai 359bed3615 fs_mgr: code clean up 
- Returns FS_MGR_MNTALL_FAIL for failure paths in fs_mgr_mount_all()
- Removes the 'goto out' in fs_mgr_do_mount() as there is nothing to do in
  the 'out' label now. Also removes the "ret = FS_MGR_DOMNT_FAILED;" and
  just return FS_MGR_DOMNT_FAILED directly for the default failure path.
- Changes some LERROR to PERROR

Test: Use fs_mgr_do_mount() to mount /system with AVB
Change-Id: I126a0124a5c9d61302f40ab9db16989500d9777e
 2017-04-28 12:47:18 +08:00
Josh Gao 49ceaec6f3 Merge "debuggerd_handler: don't assume that abort message implies fatal." am: 263e1e9509 am: f405fe0edb am: 1085eb5cc1 
am: 125dd90a82

Change-Id: Ie1e45da3562dc9e9a593e10ad60f0b357a96a22d
 2017-04-28 03:38:04 +00:00
Jaesoo Lee e894637e99 Merge "added include for unistd.h that was missing" am: 98cc0e1f02 am: 371e0bf298 am: b1989aa336 -s ours 
am: e4de9ec23e  -s ours

Change-Id: I2fb176ebded2f2a252ba6fccfd3282661fca9cc0
 2017-04-28 03:37:45 +00:00
Bowgo Tsai 92e5f2d912 Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" am: 5c7543569a am: b66306c7c1 am: 50f7d4a1ab 
am: 5547de8f8e

Change-Id: I86c4cf36fd6390a4af111d59f58327c801c4c267
 2017-04-28 03:37:28 +00:00
Jerry Zhang 91fc4fd245 Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f am: 935d600800 am: ddcc232493 
am: d3632d3ce1

Change-Id: I2d9698c24d9e03e812fd5d48c7bdfdcfcd1c2c33
 2017-04-28 03:37:12 +00:00
Jaesoo Lee 8477333939 resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp 
am: 1e00517d71

Change-Id: Ic9c11a227c76aca0f0d91531a8bddcd59f5ed821
 2017-04-28 03:36:55 +00:00
Josh Gao 125dd90a82 Merge "debuggerd_handler: don't assume that abort message implies fatal." am: 263e1e9509 am: f405fe0edb 
am: 1085eb5cc1

Change-Id: I1ae28065914b99b2c504cf95fc14cc1a0da6011d
 2017-04-28 03:35:22 +00:00
Jaesoo Lee e4de9ec23e Merge "added include for unistd.h that was missing" am: 98cc0e1f02 am: 371e0bf298 
am: b1989aa336  -s ours

Change-Id: I28ee11c91dfb3b423a4894bd613574bf448e2358
 2017-04-28 03:35:04 +00:00
Bowgo Tsai 5547de8f8e Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" am: 5c7543569a am: b66306c7c1 
am: 50f7d4a1ab

Change-Id: I9afed4e5551a4403696e6635127667e45a031635
 2017-04-28 03:34:46 +00:00
Jerry Zhang d3632d3ce1 Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f am: 935d600800 
am: ddcc232493

Change-Id: I639db7fc5797ad2ce6dd6b3591284bd6822ab0f0
 2017-04-28 03:34:29 +00:00
Abodunrinwa Toki d6ab6456c5 Initialize textclassifier model update directory 
Test: Builds successfully. Directory is initialized on install. Tests pass.
bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 34780396

Merged-In: Icbf7962f11b66579931f48053132da6e03e62c61
Change-Id: Icbf7962f11b66579931f48053132da6e03e62c61
 2017-04-28 04:15:57 +01:00
Josh Gao 1085eb5cc1 Merge "debuggerd_handler: don't assume that abort message implies fatal." am: 263e1e9509 
am: f405fe0edb

Change-Id: I2b828a4bc3cf5e0baac4d1247eed7530462adf34
 2017-04-28 03:05:57 +00:00
Josh Gao f405fe0edb Merge "debuggerd_handler: don't assume that abort message implies fatal." 
am: 263e1e9509

Change-Id: I9f89164e889b7ec7d7de6c8989044955875e3d0e
 2017-04-28 03:02:35 +00:00
Josh Gao 5fd02a8dbc debuggerd_handler: don't assume that abort message implies fatal. 
Applications can set abort messages via android_set_abort_message
without actually aborting. This leads to following non-fatal dumps
printing their output to logcat in the same format as a regular crash.

Bug: http://b/37754992
Test: debuggerd_test
Change-Id: I9c5e942984dfda36448860202b0ff1c2950bdd07
(cherry picked from commit e06f2a4886)
 2017-04-27 19:58:47 -07:00
Treehugger Robot 263e1e9509 Merge "debuggerd_handler: don't assume that abort message implies fatal." 2017-04-28 02:47:16 +00:00
Abodunrinwa Toki 3e6e906448 Merge "Initialize textclassifier model update directory" am: a079e453a3 am: f566376046 am: d13dca13e8 
am: 552a4c10b3

Change-Id: I3067795ddd40e8ff1a8eca10fa2188f36c0769ba
 2017-04-28 02:30:47 +00:00
Tom Cherry 272a77eeb7 init: fix last_reboot_reason string am: 704b27bd85 
am: 18c9ce2b93

Change-Id: I8245939809172a02129c38d4de10915d653697a3
 2017-04-28 02:30:32 +00:00
Jerry Zhang af96b5e80b Merge "Move adbd stopped trigger for configfs into core." am: e21b2fb6b4 am: fa14b1de73 am: b3988e670d 
am: ee82936ecd

Change-Id: Ib276a0384eafe25d81a684c76f8d5d58a5596414
 2017-04-28 02:30:11 +00:00
Josh Gao 637483de91 base: remove execute bit from utf8.cpp, utf8_test.cpp. 
Test: none
Change-Id: Idcd7feb2f3a7dc8706c498c55100e82d029858e0
 2017-04-27 19:10:07 -07:00
Jaesoo Lee 1e00517d71 resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0e1cc5f5367c4840eea5f56670f74a44743f1853
 2017-04-28 10:52:15 +09:00
Jaesoo Lee b1989aa336 Merge "added include for unistd.h that was missing" am: 98cc0e1f02 
am: 371e0bf298

Change-Id: Ibed5a2e73df995e234fb72949da53056ba8d71e3
 2017-04-28 01:50:51 +00:00
Jaesoo Lee 371e0bf298 Merge "added include for unistd.h that was missing" 
am: 98cc0e1f02

Change-Id: Iba8ad7abd27b0e82e2ed23c9f539bd3511726e9c
 2017-04-28 01:48:58 +00:00
Treehugger Robot 98cc0e1f02 Merge "added include for unistd.h that was missing" 2017-04-28 01:39:55 +00:00
Bowgo Tsai 50f7d4a1ab Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" am: 5c7543569a 
am: b66306c7c1

Change-Id: I3697e59dba95a3c413da4d0c2b106a07f05e323e
 2017-04-28 01:29:46 +00:00
Bowgo Tsai b66306c7c1 Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" 
am: 5c7543569a

Change-Id: I7d630bc3dc15554400f0e0c9b35919452cd7b03f
 2017-04-28 01:27:46 +00:00
Treehugger Robot 5c7543569a Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" 2017-04-28 01:21:13 +00:00
Jerry Zhang ddcc232493 Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f 
am: 935d600800

Change-Id: Id778046511d33f5eb75d533da644b54cbe49fef1
 2017-04-28 01:10:14 +00:00
Jerry Zhang 935d600800 Merge "Revert "adb: Lower EP_ALLOC retry count"" 
am: 169590c47f

Change-Id: Ia31c905eab9cb5c1c51a951896a8d1ed17978927
 2017-04-28 01:08:13 +00:00
Jerry Zhang 169590c47f Merge "Revert "adb: Lower EP_ALLOC retry count"" 2017-04-28 01:06:09 +00:00
Jaesoo Lee afc0aa78f4 Merge changes from topic 'libutils-export-headers' am: 4af3a7966b 
am: 0951ddeb69

Change-Id: I6e82e0ef68e1acdc617efe436873218f22a51412
 2017-04-28 00:57:13 +00:00
Jaesoo Lee 0951ddeb69 Merge changes from topic 'libutils-export-headers' 
am: 4af3a7966b

Change-Id: I390c56cfc6312ded05ee359931faabf9517c4067
 2017-04-28 00:55:51 +00:00