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
Jon Larimer 9f1b1caa78 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb am: 089ad5e98a -s ours 
am: 2f1562eb10

* commit '2f1562eb10279531524f54ca7c129ead66ab3673':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:44:57 +00:00
Jon Larimer 7755770ac9 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours am: d0ed7943b8 -s ours 
am: a1da204980

* commit 'a1da204980891f9e59a41d7a41d510f3f05d34bf':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:44:50 +00:00
Jon Larimer 55263d2ae3 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours am: ea1e6a59e7 
am: 088639a20f  -s ours

* commit '088639a20fc388e8d4dcf1ed471b31086c43bc83':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:41:08 +00:00
Jon Larimer 2f1562eb10 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours am: 93a3871abb 
am: 089ad5e98a  -s ours

* commit '089ad5e98ab8a4b2d4ea00c6a88d61b963797c90':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:41:02 +00:00
Jon Larimer a1da204980 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev am: f84eef3fca -s ours 
am: d0ed7943b8  -s ours

* commit 'd0ed7943b8a2f3d0000391f18899c77566a0be1a':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:40:55 +00:00
Jon Larimer 088639a20f Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours 
am: ea1e6a59e7

* commit 'ea1e6a59e7dd8d4674a2116ec5893cdf801e6339':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:37:57 +00:00
Jon Larimer 089ad5e98a Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours 
am: 93a3871abb

* commit '93a3871abbd16a3e0dee6ab8e7e87356620efeac':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:37:51 +00:00
Jon Larimer d0ed7943b8 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev 
am: f84eef3fca  -s ours

* commit 'f84eef3fca156cd9a9f2f09f305a6fd6c898f14b':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 20:37:43 +00:00
Jon Larimer ea1e6a59e7 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a 
am: 702fe6d486  -s ours

* commit '702fe6d486d2bdd920010d681b046a3396b4021a':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 14:02:59 +00:00
Jon Larimer 702fe6d486 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours 
am: 362f13d74a

* commit '362f13d74a5c57f4e2ba4f0de341896e79732dcf':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 13:59:19 +00:00
Jon Larimer 362f13d74a Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 
am: fd56dc41c7  -s ours

* commit 'fd56dc41c70a58541b9ed25f4c97ffe3fea19536':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 13:55:57 +00:00
Jon Larimer fd56dc41c7 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev 
am: 809d5a0158

* commit '809d5a01586d00ee91d13fb8d034d12584ba3314':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 13:50:40 +00:00
Jon Larimer 93a3871abb Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 
am: 442a830e9b  -s ours

* commit '442a830e9b0415460749016394b3a71b9df2af13':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 13:50:39 +00:00
Jon Larimer bc1ef58505 Merge "Add macro to call event logger for errors." into mnc-dev 
am: d028c6fa7f

* commit 'd028c6fa7fe135a3b454a1773ba59cafbba4b49e':
  Add macro to call event logger for errors.
 2015-11-11 13:46:21 +00:00
Jon Larimer 442a830e9b Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev 
am: 5280061b56

* commit '5280061b5668d87b99ff4f9ef883a3fed944bce4':
  Add macro to call event logger for errors. DO NOT MERGE
 2015-11-11 13:46:21 +00:00
Jon Larimer d028c6fa7f Merge "Add macro to call event logger for errors." into mnc-dev 2015-11-11 13:42:38 +00:00
Jon Larimer f84eef3fca Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev 2015-11-11 13:42:37 +00:00
Jon Larimer 5280061b56 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev 2015-11-11 13:42:35 +00:00
Jon Larimer 809d5a0158 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev 2015-11-11 13:42:33 +00:00
William Luh f6891c025a Add macro to call event logger for errors. 
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
 2015-11-10 22:34:08 +00:00
William Luh 9a86c283cd Add macro to call event logger for errors. DO NOT MERGE 
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
 2015-11-10 22:33:46 +00:00
William Luh f34258fa9b Add macro to call event logger for errors. DO NOT MERGE 
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
 2015-11-10 22:33:32 +00:00
William Luh 4fd82100cc Add macro to call event logger for errors. DO NOT MERGE 
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
 2015-11-10 22:33:10 +00:00
Mark Salyzyn dfbe85ec8b Merge "logd: pruning time horizon" into mnc-dr-dev 2015-11-04 18:27:25 +00:00
Mark Salyzyn 653316adf1 logd: pruning time horizon 
Estimate a time horizon of ten fold for worst UID pruning

Bug: 25453210
Bug: 24782000
Change-Id: I7118deb6d42531c68ed2ac2a59c57b0580b942cc
 2015-11-03 16:26:06 -08:00
Dan Willemsen 36b24a4a20 Remove __DATE__/__TIME__ from init and debuggerd 
Keeping these means that every build has different init and debuggerd
binaries, even if the source was the same. So OTAs that don't touch
these sources would still need to update the binaries.

Both of these messages are only informational, so can be safely removed.
Bootchart already encodes build-specific information from the system
properties.

Bug: 24204119
Change-Id: I7ebd65a20a3e031e7528c9f741616e20b3cd7446
(cherry picked from commit 30622bbb20)
 2015-10-30 14:51:29 -07:00
Christopher Ferris 69406d904a Fix incorrect check of descsz value. 
am: d917514bd6

* commit 'd917514bd6b270df431ea4e781a865764d406120':
  Fix incorrect check of descsz value.
 2015-10-29 19:12:37 +00:00
Christopher Ferris d917514bd6 Fix incorrect check of descsz value. 
Bug: 25187394

(cherry picked from commit 1fa55234d6)

Change-Id: Idbc9071e8b2b25a062c4e94118808d6e19d443d9
 2015-10-22 17:54:24 -07:00
Paul Lawrence 2b216aa89b Merge "Don't show UI on default encryption" into mnc-dr-dev 2015-10-21 14:27:38 +00:00
Tim Murray f429d37807 Reorder init.rc to avoid a kernel warning. 
3.18 has a warning in dmesg that appears when the parent cpuset's cpus
and mems are changed to something other than what the child has. Reorder
init.rc to prevent this warning from appearing.

bug 24941443

Change-Id: I49d8394063b23dce03222dcc9ddccdc32bb97ea2
 2015-10-15 12:38:15 -07:00
Ruchi Kandoi 08cf0e55a7 Merge "healthd: Adds fake battery properties for devices with no battery." into mnc-dr-dev 2015-10-12 21:40:39 +00:00
Ruchi Kandoi 42a981ddee healthd: Adds fake battery properties for devices with no battery. 
Devices which have no battery and are always plugged in will not have
any battery property initialized. This causes the 'stable power' to
never be switched which is required for updating apps.

This change recognizes such a device and manually sets the battery to
100% and charger status to connected to AC mains. It will also fake the
battery temperature.

Bug: 24258855
Change-Id: I98e5ed0dbeb7f2ab6d3802cd7e0f3a269bd8f31f
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2015-10-12 14:31:58 -07:00
Sami Tolvanen 4ae302af7d fs_mgr: trigger dm-verity error handling for invalid signatures 
Currently, the device doesn't mount verified partitions if the
verity table signature is invalid, which usually means it fails to
boot. This change instead sets up dm-verity with an invalid root
hash and triggers device-specific error handling to recover from
the corruption.

Bug: 24256506
Change-Id: I6d693306fa0e7459c5500b028e433df61ecea6fb
(cherry picked from commit 47caa5c386)
 2015-09-22 08:09:37 +00:00
Tim Murray a3f45684bd Merge "add system-background cpuset" into mnc-dr-dev 2015-09-21 19:40:03 +00:00
Narayan Kamath 7fc499bb7c am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '3f7a33a5294cd59c331d5d036021141b6f1aef1e':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-20 01:10:10 +00:00
Narayan Kamath 222a15622a am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit 'dd0932e831551d0a57a8af646ac0f9f386e4f579':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-20 01:10:09 +00:00
Brian Carlstrom 661600dd0f am 110f705e: resolved conflicts for 832a0d1c to mnc-dev 
* commit '110f705e1077b388a69814e9cdd2907a6ad7d5bb':
  libutils: Fix integer overflows in VectorImpl.
 2015-09-20 01:02:27 +00:00
Narayan Kamath 3f7a33a529 am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '26d47f2671e67968ea408417f03844681faf9455':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-20 01:00:25 +00:00
Narayan Kamath dd0932e831 am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit '81b428f27a74f693b7c19b873c3a5a9af69da641':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-20 01:00:24 +00:00
Brian Carlstrom 110f705e10 resolved conflicts for 832a0d1c to mnc-dev 
Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
 2015-09-19 17:29:42 -07:00
Narayan Kamath 26d47f2671 am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '491035ce1ceec310f98347654ea17cafa6ccb520':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-20 00:08:45 +00:00
Narayan Kamath 81b428f27a am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit 'db7d8e963c54246a2792e91c678bbe00fb2cc3aa':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-20 00:08:44 +00:00
Brian Carlstrom 832a0d1c64 resolved conflicts for cf676a86 to lmp-mr1-ub-dev 
Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
 2015-09-19 16:13:00 -07:00
Tim Murray cba6ad7449 add system-background cpuset 
add a new cpuset for system services that should not run on
larger cores

bug 24144797

Change-Id: I21a54f0d6b46b3b8bd8c4564b8685c88cfc4a57d
 2015-09-18 13:18:49 -07:00
Narayan Kamath 491035ce1c am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '8253cb0436a09dcb325dbdecf4689b0a18b25644':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-17 23:03:11 +00:00
Narayan Kamath db7d8e963c am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit '68a7837088c40e367ebf16959adc9d20d06ef0ea':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-17 23:03:10 +00:00
Narayan Kamath cf676a8686 am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl. 
* commit '52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37':
  libutils: Fix integer overflows in VectorImpl.
 2015-09-17 23:01:45 +00:00
Mark Salyzyn 93807d472d Merge "logd: worst uid record watermark part five" into mnc-dr-dev 2015-09-14 14:16:49 +00:00
Narayan Kamath 8253cb0436 am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. 
* commit '0cc468dc2a1420d5c9dac563cc6c5d11b862ff47':
  Follow up to change b638126ed DO NOT MERGE.
 2015-09-12 09:46:19 +00:00
Narayan Kamath 68a7837088 am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev 
* commit '2e64e9590a36511eaaf655b24002d24afe927f04':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
 2015-09-12 09:46:18 +00:00