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,170 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

10170 Commits

Author SHA1 Message Date
Elliott Hughes 895d674738 am 7a8420ec: Merge "fix duplicated grep usage printing" 
* commit '7a8420ec4a7d248028b0a922e2d947f2129b1fe7':
  fix duplicated grep usage printing
 2014-07-11 02:12:28 +00:00
Mark Salyzyn ad806908bb am 755df295: Merge "logd: test: disable kernel LOGGER" 
* commit '755df2956fdf43e2a8e416a84361f14c474e6a8f':
  logd: test: disable kernel LOGGER
 2014-07-11 02:12:27 +00:00
Elliott Hughes 85dfe98830 am 796fccb8: Merge "Fix environment variable assignment in init" 
* commit '796fccb80d603bb79d2591047f1c3b83755bfa8b':
  Fix environment variable assignment in init
 2014-07-11 02:11:49 +00:00
Ruchi Kandoi a78fc23491 healthd: Reports arbitrary numbers for capacity and temperature when 
connected to fake battery.

Detects if the device is attached to a fake battery if yes, healthd
reports 42% battery charge and 42.2 degrees temperature.

Change-Id: I2508fd91c8d3848ea64f57ab59d20be1c2817913
 2014-07-11 01:19:28 +00:00
Jungshik Jang 6fe316102a Merge "Fix size of "values" fields of audio_gain_config." 2014-07-10 21:52:20 +00:00
Jungshik Jang f7e5aeadb7 Fix size of "values" fields of audio_gain_config. 
It should be sizeof(audio_channel_mask_t) * 8 not
sizeof(audio_channel_mask_t) alone.

Change-Id: I3523dd4d44a0900ba1845b3675a22451f1fc2f3c
 2014-07-11 03:37:42 +00:00
Elliott Hughes 8098114c90 Merge "Sync with upstream grep." 2014-07-10 21:39:36 +00:00
Elliott Hughes 04650ef7f6 Sync with upstream grep. 
Change-Id: Ie1da2e95ee7e3513afb87f357be983dc80cd1515
 2014-07-10 19:38:01 -07:00
Colin Cross 212e979865 add cleanspec for lmkd 
Change-Id: I249a4dcac4b12382c25f68c8d57a108794475623
 2014-07-10 14:26:57 -07:00
Elliott Hughes 7a8420ec4a Merge "fix duplicated grep usage printing" 2014-07-10 21:14:09 +00:00
Rocky Zhang b34b1fcb2b fix duplicated grep usage printing 
Change-Id: I579d2046f96ba8ae9fd0bf8f36e2e2f64da622ea
Signed-off-by: Rocky Zhang <zhangyan.hit@gmail.com>
 2014-07-11 09:49:35 +08:00
Mark Salyzyn 755df2956f Merge "logd: test: disable kernel LOGGER" 2014-07-10 20:49:23 +00:00
Christopher Ferris 56cbd19b1b Merge "Fix build." 2014-07-10 20:43:44 +00:00
Christopher Ferris 3cbea9f056 Fix build. 
Change-Id: Ied4adacde94ee10deb30647156f07d46a38fbe1f
 2014-07-10 23:12:49 -07:00
Mark Salyzyn 89472df4cd logd: test: disable kernel LOGGER 
Bug: 15384806
Change-Id: I3072d6dd0618fa9ebe151c78a85eb121327f9df3
 2014-07-10 13:31:57 -07:00
Elliott Hughes 796fccb80d Merge "Fix environment variable assignment in init" 2014-07-10 16:05:36 +00:00
James Morrissey 381341f5f7 Fix environment variable assignment in init 
The init process allows environment variables to be specified in
the rc script globally, via 'export', and for a specific process,
via the 'setenv' option.

However, the mechanism for assembling the environment simply
appended the new variable without checking whether it was already
defined, so it was not possible to overwrite an existing entry.
This patch fixes that behaviour.

Limitations and concerns:

The limit of a maximum number of 31 variables is unchanged.

Currently, most callers of "add_environment" do not check the return
value, but the function now logs the failure rather than failing
silently.

Change-Id: Ie9a68c37a0f55c5b40e904e695cd35514f67f480
 2014-07-10 11:22:46 -07:00
Badhri Jagan Sridharan bf9ef51969 am cb7be1e8: am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable" 
* commit 'cb7be1e8cd4e4388d014a5c48df455a5715f2180':
  adbd: adb root should terminate adbd only if it's debuggable
 2014-07-10 00:49:56 +00:00
Elliott Hughes c89c0c65c7 am 75b3d8c0: am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure." 
* commit '75b3d8c07b3a658be574584f7004fe4468916b5b':
  Fix arm emulator "D register out of range for selected VFP version" build failure.
 2014-07-10 00:49:54 +00:00
Elliott Hughes 0dd3fe220b am b237f5fb: am 5acbb9bc: am b5186598: Merge "Integrate vfp-crasher with crasher." 
* commit 'b237f5fb5d691adbb7e20b7e94096a019ff60bca':
  Integrate vfp-crasher with crasher.
 2014-07-10 00:49:53 +00:00
Elliott Hughes 67db9d5f73 am b2ac4243: am f76c8fe6: am 328c3ef6: Merge "Fix typo in fs.h" 
* commit 'b2ac4243000057baf1656c93197150ba7665137e':
  Fix typo in fs.h
 2014-07-10 00:49:53 +00:00
Badhri Jagan Sridharan cb7be1e8cd am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable" 
* commit '87c7a0d74b9dadaedfe6805c57d221d9c445aaf6':
  adbd: adb root should terminate adbd only if it's debuggable
 2014-07-10 00:16:15 +00:00
Elliott Hughes 75b3d8c07b am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure." 
* commit 'd0fa7342c536180519ddc475fbf6f5219b0424d9':
  Fix arm emulator "D register out of range for selected VFP version" build failure.
 2014-07-10 00:16:12 +00:00
Elliott Hughes b237f5fb5d am 5acbb9bc: am b5186598: Merge "Integrate vfp-crasher with crasher." 
* commit '5acbb9bcb82c396279afb5cebc4e76a435066c9f':
  Integrate vfp-crasher with crasher.
 2014-07-10 00:16:12 +00:00
Elliott Hughes b2ac424300 am f76c8fe6: am 328c3ef6: Merge "Fix typo in fs.h" 
* commit 'f76c8fe630c45fc30dde177c42bee9809cf6b645':
  Fix typo in fs.h
 2014-07-10 00:16:11 +00:00
Badhri Jagan Sridharan 87c7a0d74b am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable" 
* commit '77a2c22dcbab56b260eb9d39c84fe8f98258cebb':
  adbd: adb root should terminate adbd only if it's debuggable
 2014-07-10 00:08:35 +00:00
Elliott Hughes d0fa7342c5 am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure." 
* commit '660ba372989f4289990d91277c4334475769fe04':
  Fix arm emulator "D register out of range for selected VFP version" build failure.
 2014-07-10 00:08:18 +00:00
Elliott Hughes 5acbb9bcb8 am b5186598: Merge "Integrate vfp-crasher with crasher." 
* commit 'b518659848b6f3f939e1b5b150ae8586b9b8d0ce':
  Integrate vfp-crasher with crasher.
 2014-07-10 00:08:12 +00:00
Elliott Hughes f76c8fe630 am 328c3ef6: Merge "Fix typo in fs.h" 
* commit '328c3ef6e0c89686d56b8ce5f926affacd98e815':
  Fix typo in fs.h
 2014-07-10 00:08:11 +00:00
Elliott Hughes 328c3ef6e0 Merge "Fix typo in fs.h" 2014-07-09 22:27:32 +00:00
Markus Mayer c335a3500c Fix typo in fs.h 
fs.h defined _FH_H_ rather than _FS_H_

Change-Id: I710ef53e88d3601e486fde9957f6d022871d9602
Signed-off-by: Markus Mayer <code@mmayer.net>
 2014-07-09 15:27:53 -07:00
Badhri Jagan Sridharan 77a2c22dcb Merge "adbd: adb root should terminate adbd only if it's debuggable" 2014-07-09 21:40:17 +00:00
Colin Cross 420f0a2567 Merge "lmkd: use libprocessgroup to kill forked processes" 2014-07-09 21:39:59 +00:00
Colin Cross fef9522d9b lmkd: use libprocessgroup to kill forked processes 
After sending sigkill to the main process, also call into
libprocessgroup to kill any processes that were forked.

Bug: 15313911
Change-Id: I05577c6f5b70800ce0a01f480c8870c2c601afda
 2014-07-09 17:24:39 -07:00
Colin Cross cf8d1c22f7 Add libprocessgroup 
libprocessgroup will allow Zygote to place processes
in a cgroup, and then kill the process and all forked processes
later.  lmkd will also kill all forked processes.

Bug: 15313911
Change-Id: I20404d0dbe448f1c475d2f4c61cccca462f9e544
 2014-07-09 17:24:39 -07:00
Colin Cross 038975a5c8 Merge "lmkd: pass uid from ActivityManager to lmkd" 2014-07-09 21:34:29 +00:00
Nick Kralevich ee0388e768 am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache" 
* commit 'f89ddf76f9e3c10af9002cdb0d9b8eadcd59bf15':
  restorecon_recursive /cache
 2014-07-09 20:03:29 +00:00
Nick Kralevich f89ddf76f9 am d05245a4: am c87237f5: Merge "restorecon_recursive /cache" 
* commit 'd05245a4b10044670ed8456c5c869490fd90583f':
  restorecon_recursive /cache
 2014-07-09 20:01:02 +00:00
Nick Kralevich d05245a4b1 am c87237f5: Merge "restorecon_recursive /cache" 
* commit 'c87237f5af41905a21a348a164a1ef3c31ace6c6':
  restorecon_recursive /cache
 2014-07-09 19:58:55 +00:00
Colin Cross fbb78c6fee lmkd: pass uid from ActivityManager to lmkd 
lmkd will use the uid to find processgroups and kill forked processes.

Bug: 15313911
Change-Id: I3f7bb003ccf15650cae6ebc2c042ddeb4cc796fc
 2014-07-09 11:30:52 -07:00
Daniel Rosenberg 33e7b13167 Made formatting for newfs_msdos.c more uniform 
Change-Id: I3d14350c70c05a7e2f713d0065524d78f9a413c6
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-07-09 17:33:39 +00:00
Elliott Hughes 660ba37298 Merge "Fix arm emulator "D register out of range for selected VFP version" build failure." 2014-07-09 14:45:53 +00:00
Elliott Hughes cb7aae167e Fix arm emulator "D register out of range for selected VFP version" build failure. 
Change-Id: Ia37cb3f8ecb00a927fa3fc8b4131c158413646e7
 2014-07-09 16:41:04 -07:00
Elliott Hughes b518659848 Merge "Integrate vfp-crasher with crasher." 2014-07-09 14:45:53 +00:00
Elliott Hughes e7f18e14a9 Integrate vfp-crasher with crasher. 
There's no good reason to separate "fill the integer registers with
recognizable patterns and crash" from "fill the FP registers with recognizable
patterns and crash".

Also remove the incorrect use of ARCH_ARM_HAVE_VFP_D32 rather than try to fix
it.

Change-Id: I3a4a3aca1575de5489314027ae52168997404d79
 2014-07-09 12:19:32 -07:00
Colin Cross fb27d34dac Merge "Add libprocessgroup" 2014-07-09 14:38:35 +00:00
Elliott Hughes 6ebab06dc4 am f043f061: am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling." 
* commit 'f043f061295a787aca42186fe9ab87c24d393b92':
  Fix sdcard's FUSE_FSYNCDIR handling.
 2014-07-09 12:16:46 +00:00
Elliott Hughes 40372e5b4e am 94645665: am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr." 
* commit '9464566580559b7353e6e2c898da79ffbbf993aa':
  Make sdcard log to the log rather than stderr.
 2014-07-09 12:16:41 +00:00
Elliott Hughes f043f06129 am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling." 
* commit '060b6ecb663a903d4a2c0496fadcfbc4148bc0d6':
  Fix sdcard's FUSE_FSYNCDIR handling.
 2014-07-08 22:29:06 +00:00
Elliott Hughes 060b6ecb66 am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling." 
* commit '6e141aea189769a428a7da6c2206df6d0ed2c69d':
  Fix sdcard's FUSE_FSYNCDIR handling.
 2014-07-08 22:25:12 +00:00