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

10882 Commits

Author SHA1 Message Date
Paul Lawrence 6e9857da67 resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp 
Change-Id: I6b62347c3acfda7c2c954e719547021009d20c01
 2014-10-10 09:07:21 -07:00
Paul Lawrence c638c6647d resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp 
Change-Id: I9ff777a6309aab2b5b18323dd4ee7617cb1c3180
 2014-10-09 15:17:23 -07:00
Mark Salyzyn c7fb2ce7d3 am fd4f05ce: Merge changes I74796043,I7d0b85b5,I74796043,I74796043,Ie325e1b5, ... into lmp-mr1-dev 
* commit 'fd4f05ce058cfff745c1edbe06d0703cc4a2954d':
  logd: kill(0,0) issue
  logd: LogStatistics leak
  logd: Add control statistics enable/disable.
  logd: cleanup
  logd: auditd: report facility LOG_AUTH
  logd: auditd: kmsg priority
 2014-10-09 21:41:30 +00:00
Paul Lawrence cc496dbcd7 resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp 
Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
 2014-10-09 13:24:06 -07:00
Paul Lawrence bbb3631911 Revert "Revert "Enable verity on userdebug, and add disable-verity to adb"" 
This reverts commit 152d2d4234.

Fixed build error, and also fixed memory leak spotted from warning.

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
 2014-10-09 09:05:36 -07:00
Mark Salyzyn 3e64bf45e6 am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage" 
* commit 'af191cd157f076ee5d99890711e2881a60d7770a':
  fs_mgr: fix build breakage
 2014-10-09 14:25:32 +00:00
Mark Salyzyn af191cd157 am 6b66025f: Merge "fs_mgr: fix build breakage" 
* commit '6b66025f6f3e48d182e8d6aeb989d0f39eb551e3':
  fs_mgr: fix build breakage
 2014-10-09 14:20:05 +00:00
Mark Salyzyn 6b66025f6f Merge "fs_mgr: fix build breakage" 2014-10-09 14:14:55 +00:00
Nick Kralevich a49bfc0d26 Merge "Revert "Enable verity on userdebug, and add disable-verity to adb"" into lmp-mr1-dev 2014-10-08 23:59:00 +00:00
Nick Kralevich 152d2d4234 Revert "Enable verity on userdebug, and add disable-verity to adb" 
Build is broken.

system/core/fs_mgr/fs_mgr_verity.c: In function 'fs_mgr_setup_verity':
system/core/fs_mgr/fs_mgr_verity.c:103:20: error: 'verity_table_signature' may be used uninitialized in this function [-Werror=maybe-uninitialized]
     if (!RSA_verify(key,
                    ^
system/core/fs_mgr/fs_mgr_verity.c:374:11: note: 'verity_table_signature' was declared here
     char *verity_table_signature;
           ^
cc1: all warnings being treated as errors
make: *** [out/target/product/minnow/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr_verity.o] Error 1
make: *** Waiting for unfinished jobs....

This reverts commit d4cea0bc16.

Change-Id: I6862cc79ef9d944a2472b6fb2e46dae514cea8ce
 2014-10-08 23:55:05 +00:00
Mark Salyzyn 89fa114e2a fs_mgr: fix build breakage 
Some compilers are not as smart as other compilers

Change-Id: I9d93c73bdbd2dca37373d8a42a2ed510d0559274
 2014-10-08 16:43:47 -07:00
Mark Salyzyn fd4f05ce05 Merge changes I74796043,I7d0b85b5,I74796043,I74796043,Ie325e1b5, ... into lmp-mr1-dev 
* changes:
  logd: kill(0,0) issue
  logd: LogStatistics leak
  logd: Add control statistics enable/disable.
  logd: cleanup
  logd: auditd: report facility LOG_AUTH
  logd: auditd: kmsg priority
 2014-10-08 23:07:07 +00:00
Paul Lawrence ae413a71cb Merge "Enable verity on userdebug, and add disable-verity to adb" into lmp-mr1-dev 2014-10-08 22:57:15 +00:00
Paul Lawrence d4cea0bc16 Enable verity on userdebug, and add disable-verity to adb 
Bug: 17691572

Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
 2014-10-08 15:24:37 -07:00
Mark Salyzyn 260f3be312 logd: kill(0,0) issue 
- Recognize pid=0 as special case (kernel or pre-init sourced)
  and refrain from treating it in the general case.

(cherry pick from commit df5aa61f05)

Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e012
 2014-10-08 14:01:45 -07:00
Mark Salyzyn 1e1d71e26c logd: LogStatistics leak 
- uid = -1 in subtract operation to match add

(cherry pick from commit f48ea7c8dc)

Bug: 15986335
Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261
 2014-10-08 14:01:45 -07:00
Mark Salyzyn a0e53540da logd: Add control statistics enable/disable. 
- ro.build.type=user turn off statistics
- ro.config.low_ram=true turn off statistics
- logd.statistics override

(cherry pick from commit f5fc509589)

Bug: 17526159
Bug: 17526187
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e00f
 2014-10-08 14:01:45 -07:00
Mark Salyzyn 987f1e0de3 logd: cleanup 
- simplify access and control exposure to class list
- indent
- compile warning
- Follow standard naming convention for variables and methods
- merge common fragments
- Side Effects: none

(cherry pick from commit e72c6e4366)

Bug: 17526159
Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e010
 2014-10-08 14:01:45 -07:00
Mark Salyzyn 823a4c727a logd: auditd: report facility LOG_AUTH 
(cherry pick from commit 7ee2aef8e0)

Change-Id: Ie325e1b58f52b6c728d5cfd6f6b87287fcf32e10
 2014-10-08 14:01:45 -07:00
Mark Salyzyn 327cac6e0c logd: auditd: kmsg priority 
(cherry pick from commit 6bdeee0ce6)

Change-Id: I2016fe140e2daf6c69efbd10aef205fffb931aa1
 2014-10-08 14:01:45 -07:00
Riley Andrews d1380d645d am 33b33549: Merge "Make the default cgroup, the foreground cgroup." into lmp-mr1-dev 
* commit '33b335495c7b8eea4b9af13a7157cf83cd085129':
  Make the default cgroup, the foreground cgroup.
 2014-10-08 20:51:48 +00:00
Riley Andrews 33b335495c Merge "Make the default cgroup, the foreground cgroup." into lmp-mr1-dev 2014-10-08 20:40:23 +00:00
Elliott Hughes c496e02c39 am 2c05b4fe: Fix top for very large VSS. 
* commit '2c05b4fe419c6fc008a51359a894f172768977ac':
  Fix top for very large VSS.
 2014-10-08 18:51:08 +00:00
Elliott Hughes 5c9d4227fe am f7c287b7: am 47d24416: Merge "Fix top for very large VSS." 
* commit 'f7c287b750a2353976fc51aa3b45b380024ae84b':
  Fix top for very large VSS.
 2014-10-08 18:29:57 +00:00
Elliott Hughes f7c287b750 am 47d24416: Merge "Fix top for very large VSS." 
* commit '47d244165751f0fa03e63a8b7aa44b50c5f3bf88':
  Fix top for very large VSS.
 2014-10-08 18:24:13 +00:00
Elliott Hughes 2c05b4fe41 Fix top for very large VSS. 
Bug: 17913995

(cherry picked from commit 052d78f334)

Change-Id: Ia657c1aa5776f947905d8b0d499d64b5cfbae50c
 2014-10-08 11:21:23 -07:00
Elliott Hughes 47d2441657 Merge "Fix top for very large VSS." 2014-10-08 18:20:31 +00:00
Elliott Hughes 052d78f334 Fix top for very large VSS. 
Bug: 17913995
Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
 2014-10-08 11:20:03 -07:00
Christopher Ferris 8525ab83fb am 525db43b: am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev 
* commit '525db43bf5351865a0483eb7f20d171a4895788b':
  Fix write past end of memory.
 2014-10-08 07:52:00 +00:00
Christopher Ferris 525db43bf5 am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev 
* commit '6f7fd39536b8d3dd7c0a5bbd9350e473e559ebff':
  Fix write past end of memory.
 2014-10-08 05:24:51 +00:00
Christopher Ferris 6f7fd39536 am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev 
* commit '3fe9adc932948da8993d3f812bce1875efc47c0e':
  Fix write past end of memory.
 2014-10-08 05:12:00 +00:00
Christopher Ferris 3fe9adc932 Merge "Fix write past end of memory." into lmp-dev 2014-10-07 23:19:40 +00:00
Christopher Ferris de722e56df Fix write past end of memory. 
The computed flattened size of the blob does not match the size used by the
flatten function when the last cached entry size is not 4 byte aligned.

Bug: 17873145
Change-Id: I9f9fc102d4bde4681ae977b6de5f263aaaf56708
 2014-10-07 14:52:31 -07:00
Riley Andrews 522d72b702 Make the default cgroup, the foreground cgroup. 
All kernel services will now be in the same cgroup as
foreground applications. This will now make kernel threads
not implicitly higher priority than android foreground
services.

Bug 17681097

Change-Id: I28e81c7aade50428d5395df86f00ce01c1e7af02
 2014-10-07 19:24:54 +00:00
Christopher Ferris c611e19c60 am af162c8b: am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding. 
* commit 'af162c8b80269781e3602fd0b0e79611ce041f93':
  DO NOT MERGE Restore libcorkscrew unwinding.
 2014-10-07 17:54:13 +00:00
Christopher Ferris 5abc428a36 am 05c32e75: am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be created. 
* commit '05c32e75df7ddb47c1a9a4615a5445a1bb331517':
  Log stack even if tombstone cannot be created.
 2014-10-07 17:54:12 +00:00
Christopher Ferris af162c8b80 am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding. 
* commit '63e6fe92bbfe73a3637393d0ca80856954c0d5f7':
  DO NOT MERGE Restore libcorkscrew unwinding.
 2014-10-07 17:42:40 +00:00
Christopher Ferris 05c32e75df am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be created. 
* commit 'eef1c7035aadf3b145e506d0e475cf3779befcb3':
  Log stack even if tombstone cannot be created.
 2014-10-07 17:42:40 +00:00
Christopher Ferris 63e6fe92bb am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding. 
* commit '4105613009614ed7a6622017a592b7bd728b1345':
  DO NOT MERGE Restore libcorkscrew unwinding.
 2014-10-07 17:31:45 +00:00
Christopher Ferris eef1c7035a am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be created. 
* commit 'bf1f5cb928bc2dc92187b85b4aa04650475a857b':
  Log stack even if tombstone cannot be created.
 2014-10-07 17:31:44 +00:00
Carson Liao 519d1cf44a am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM feature 
* commit '4b0374ae1a97cff279f287dded14619e9579da62':
  modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
 2014-10-07 17:06:04 +00:00
Carson Liao 4b0374ae1a am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM feature 
* commit '4c4cf467f5857e9ec4a0688d75854cc9cdaa1d4d':
  modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
 2014-10-07 16:57:35 +00:00
Christopher Ferris 4105613009 am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding. 
* commit '5a69c1db365323f984c6a8afd1fc035551e96d99':
  DO NOT MERGE Restore libcorkscrew unwinding.
 2014-10-07 15:27:35 +00:00
Christopher Ferris bf1f5cb928 am 290efd24: (-s ours) Log stack even if tombstone cannot be created. 
* commit '290efd244d8af18811b2ef2dac8f30cc7a37e066':
  Log stack even if tombstone cannot be created.
 2014-10-07 15:27:34 +00:00
Mark Salyzyn 396d11e3c5 am b2a5d839: am a083c857: Merge changes I7d0b85b5,I74796043 
* commit 'b2a5d839ec27c112ab3b0929ee4cf117a876a547':
  logd: LogStatistics leak
  logd: kill(0,0) issue
 2014-10-07 14:31:34 +00:00
Mark Salyzyn b2a5d839ec am a083c857: Merge changes I7d0b85b5,I74796043 
* commit 'a083c8578a8cfa44b50e6d1159b83182aba63bcb':
  logd: LogStatistics leak
  logd: kill(0,0) issue
 2014-10-07 14:27:06 +00:00
Mark Salyzyn a083c8578a Merge changes I7d0b85b5,I74796043 
* changes:
  logd: LogStatistics leak
  logd: kill(0,0) issue
 2014-10-07 14:23:46 +00:00
Carson Liao 4c4cf467f5 modified AUDIO_SOURCE_FM_TUNER enum value for FM feature 
Review: https://partner-android-review.git.corp.google.com/#/c/183993

    Signed-off-by: Carson Liao <carson.liao@mediatek.com>

Change-Id: I8d70b197bcdc710119031bcf622fee0c1b3b3aa7
 2014-10-06 22:02:37 -07:00
Mark Salyzyn 4a774356ca am 332bdffa: am 09dc0633: Merge changes I74796043,I74796043 
* commit '332bdffa4fd2f3c12bd501cdd92c037d337f3cc7':
  logd: Add control statistics enable/disable.
  logd: cleanup
 2014-10-06 23:10:29 +00:00
Mark Salyzyn 332bdffa4f am 09dc0633: Merge changes I74796043,I74796043 
* commit '09dc063319d017625fbde0fd380ed677b680415e':
  logd: Add control statistics enable/disable.
  logd: cleanup
 2014-10-06 23:06:50 +00:00