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

5022 Commits

Author SHA1 Message Date
The Android Open Source Project c8e3a27b43 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I89230f756ce6caee4d7fa4514f47b6b0fc44d1f3
 2012-11-06 12:19:18 -08:00
Stephen Smalley 3fb6110830 Document the SELinux extensions to the Android init language. 
Change-Id: I9b066e0789c93e5147c28a60baeed91c44dd9359
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2012-11-02 15:22:34 -04:00
The Android Open Source Project d249cddca6 am 62edaa59: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '62edaa59a58b2d73c6a42a80fc4794f52d78c6e2':
 2012-10-31 09:23:11 -07:00
The Android Open Source Project 62edaa59a5 Reconcile with jb-mr1-release - do not merge 
Change-Id: I74d83ad681e16b5e548eb2be6af985d6349ee83e
 2012-10-31 09:18:57 -07:00
Elliott Hughes 23964303b4 am 3427e80e: am a6fb0e05: Merge "Fix debuggerd\'s use of readdir_r(3)." 
* commit '3427e80ef38bc7aae1278cfe78a65d9524f92c69':
  Fix debuggerd's use of readdir_r(3).
 2012-10-30 17:01:09 -07:00
Elliott Hughes 3427e80ef3 am a6fb0e05: Merge "Fix debuggerd\'s use of readdir_r(3)." 
* commit 'a6fb0e05aa95995445c6f2b65f07db26bdbfd46c':
  Fix debuggerd's use of readdir_r(3).
 2012-10-30 16:57:51 -07:00
Elliott Hughes a6fb0e05aa Merge "Fix debuggerd's use of readdir_r(3)." 2012-10-30 15:53:18 -07:00
Elliott Hughes c463d2cf9c Fix debuggerd's use of readdir_r(3). 
Change-Id: I1b178af054cefebfb774320e4b4699d6dc8bbb01
 2012-10-26 16:47:09 -07:00
Nick Kralevich 7c85af005d am 6575a162: am 8f98c4b5: Merge "Fix dirfd crash issue in property service" 
* commit '6575a1625ac585b46f90c6f036db9231db50c969':
  Fix dirfd crash issue in property service
 2012-10-23 10:49:48 -07:00
Nick Kralevich 6575a1625a am 8f98c4b5: Merge "Fix dirfd crash issue in property service" 
* commit '8f98c4b5f011db8637ce1b9361e82d59b13434f4':
  Fix dirfd crash issue in property service
 2012-10-23 10:46:55 -07:00
Nick Kralevich 8f98c4b5f0 Merge "Fix dirfd crash issue in property service" 2012-10-23 09:58:25 -07:00
Yi-wei Zhao e41bc31555 Fix dirfd crash issue in property service 
In "init: harden property service" patch, dirfd() is invoked
without checking whether opendir() return successfully. It may
fail if load_persistent_properties() is invoked before userdata
partition is mounted; then dirfd(NULL) will make init crash.
This may happen if "is_charger" is true.

Change-Id: I216fb743a3c9fa050f92fcb31b62e766346d84bb
Signed-off-by: Yi-wei Zhao <gbjc64@motorola.com>
 2012-10-23 21:31:06 +08:00
Elliott Hughes ca96a793f3 am 066d3f9b: resolved conflicts for merge of 3e5e9e9e to jb-mr1-dev-plus-aosp 
* commit '066d3f9b3bd77df71542b132adda8eb25bc013c0':
  Add a directory for tzdata updates.
 2012-10-22 14:47:12 -07:00
Elliott Hughes 066d3f9b3b resolved conflicts for merge of 3e5e9e9e to jb-mr1-dev-plus-aosp 
Change-Id: I621d0e984a266478b4297a25afd164c1275e30f9
 2012-10-22 14:35:12 -07:00
Elliott Hughes 3e5e9e9ee2 Merge "Add a directory for tzdata updates." 2012-10-22 13:31:52 -07:00
Elliott Hughes f820e85164 Add a directory for tzdata updates. 
Bug: 7012465
Change-Id: I7e2c9965a4bcad125ca4fb788b842bd114b5619c
 2012-10-19 18:10:05 -07:00
Elliott Hughes 663005248d The localtime_tz and mktime_tz extensions are now in bionic. 
Bug: 7012465

(cherry-pick of d03072ffde3279fbb60591a0d07c820d8e792762.)

Conflicts:

	libcutils/Android.mk

Change-Id: I5e34edd4c8f59cc0a4d5dcc4740707ae063608a0
 2012-10-18 11:38:23 -07:00
The Android Automerger 74365b18c1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-17 16:07:48 -07:00
Zhihai Xu f5f4e31f78 am a40f5e66: am 831f8cf9: am 9f239afc: second user doesnot pickup input operations from A2DP 
* commit 'a40f5e662db68b297ff20c9ed418c726e0c001a1':
  second user doesnot pickup input operations from A2DP
 2012-10-17 10:07:34 -07:00
Zhihai Xu a40f5e662d am 831f8cf9: am 9f239afc: second user doesnot pickup input operations from A2DP 
* commit '831f8cf941fa1d298652fdf95fccb7bc693b4fc4':
  second user doesnot pickup input operations from A2DP
 2012-10-17 10:04:46 -07:00
Zhihai Xu 831f8cf941 am 9f239afc: second user doesnot pickup input operations from A2DP 
* commit '9f239afc3565770f39ae94c2969addb520af3a40':
  second user doesnot pickup input operations from A2DP
 2012-10-17 10:02:01 -07:00
Kenny Root 429bbfcafb am 2a36ae56: am 7b88a90d: Merge "Remove HAVE_SELINUX guards" 
* commit '2a36ae5608e9d655b2bb14ce538f6fbdb910cada':
  Remove HAVE_SELINUX guards
 2012-10-17 09:59:41 -07:00
Kenny Root 2a36ae5608 am 7b88a90d: Merge "Remove HAVE_SELINUX guards" 
* commit '7b88a90da2a27e347fc16c14fa577f4ae1ef07fd':
  Remove HAVE_SELINUX guards
 2012-10-17 09:57:10 -07:00
Kenny Root 7b88a90da2 Merge "Remove HAVE_SELINUX guards" 2012-10-17 09:35:56 -07:00
Kenny Root b5982bf7c6 Remove HAVE_SELINUX guards 
Change-Id: I8272c573b3c5dc663203bafab68fad5e94d89364
 2012-10-16 23:18:18 -07:00
Kenny Root efb5e3c709 resolved conflicts for merge of 20f5daa8 to master 
Change-Id: Ie3e67696d265a56dfa4d089c777506f27783a9a6
 2012-10-16 18:00:29 -07:00
Kenny Root 20f5daa865 resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aosp 
Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba
 2012-10-16 17:51:14 -07:00
Zhihai Xu 9f239afc35 second user doesnot pickup input operations from A2DP 
bug 7335014

Change-Id: I39e450d254647f0b84a07f38f2f2571711fca075
 2012-10-16 17:32:51 -07:00
Kenny Root 44f4f8a4d2 Merge "Remove HAVE_SELINUX guards" 2012-10-16 16:33:45 -07:00
Kenny Root b83c09812f Remove HAVE_SELINUX guards 
Change-Id: Idef0a784a1d237257ff4135bb1df62ff8a67ded3
 2012-10-16 12:34:06 -07:00
The Android Automerger 80a99e31a0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-16 07:00:10 -07:00
Todd Poynor 55d039efb5 am d9430179: am c907ce77: am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev 
* commit 'd94301799518a69f2b2b5a2b20bf9d4403658d7e':
  init.trace.rc: Set perms for power/clock_set_rate events
 2012-10-15 20:25:09 -07:00
Jean-Michel Trivi d306a6aa28 am 28b032c9: am 7908567b: am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev 
* commit '28b032c9398a719aacb0ed15595d55416db5e430':
  Remove force use definition for remote audio submix
 2012-10-15 20:25:08 -07:00
Todd Poynor d943017995 am c907ce77: am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev 
* commit 'c907ce77a099f28b07b754e9f69619adbe1e345f':
  init.trace.rc: Set perms for power/clock_set_rate events
 2012-10-15 20:18:52 -07:00
Jean-Michel Trivi 28b032c939 am 7908567b: am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev 
* commit '7908567b642ec5a49b9d0baa7e0285cc742ced61':
  Remove force use definition for remote audio submix
 2012-10-15 20:17:59 -07:00
Daniel Drown b49183f122 Allocate a UID for clatd 
clatd(464xlat) runs as its own UID after it drops root privs

Change-Id: I2392f8127dcd90d16b0f20ff31bcc5aa096db464
Signed-off-by: Daniel Drown <dan-android@drown.org>
 2012-10-15 20:22:53 -05:00
Todd Poynor c907ce77a0 am 7b4aa677: Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev 
* commit '7b4aa677b1860b9a83f9cde7d71ca0d5bc193422':
  init.trace.rc: Set perms for power/clock_set_rate events
 2012-10-15 17:38:26 -07:00
Todd Poynor 7b4aa677b1 Merge "init.trace.rc: Set perms for power/clock_set_rate events" into jb-mr1-dev 2012-10-15 17:36:12 -07:00
Todd Poynor 4ef6e4baa9 init.trace.rc: Set perms for power/clock_set_rate events 
Bug: 7351763

Change-Id: I1ee3d7c9b55d1b55df6cafb1bf21f9139d964646
 2012-10-15 17:16:55 -07:00
Jean-Michel Trivi 7908567b64 am 14075567: Merge "Remove force use definition for remote audio submix" into jb-mr1-dev 
* commit '14075567de367bd109a256514119fc16e8d4cf67':
  Remove force use definition for remote audio submix
 2012-10-15 16:28:02 -07:00
Jean-Michel Trivi 14075567de Merge "Remove force use definition for remote audio submix" into jb-mr1-dev 2012-10-15 16:26:28 -07:00
Nick Kralevich 69ce489fc3 fs.c: Fix implicit declaration of function 'mkstemp' 
system/core/libcutils/fs.c: In function 'fs_write_atomic_int':
system/core/libcutils/fs.c:109:5: warning: implicit declaration of function 'mkstemp' [-Wimplicit-function-declaration]

Change-Id: I337ecb818f85e20b058f782df45987acf2e9d6c1
 2012-10-15 15:51:33 -07:00
The Android Open Source Project 618a183c58 am 133155e3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '133155e3d825266900c9bf9464163f27faf69838':
 2012-10-15 07:42:57 -07:00
The Android Open Source Project 133155e3d8 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: Ie75896ec89b34fe067a2d1c6b34309629459228b
 2012-10-15 07:40:44 -07:00
Kenny Root 6816665886 am 1dcaf9d0: am 51ccef27: Merge "Add TEMP_FAILURE_RETRY macro for darwin" 
* commit '1dcaf9d054bf92a17d82160865bba5c6f7d15adb':
  Add TEMP_FAILURE_RETRY macro for darwin
 2012-10-13 13:56:50 -07:00
Kenny Root 1dcaf9d054 am 51ccef27: Merge "Add TEMP_FAILURE_RETRY macro for darwin" 
* commit '51ccef27cab58277775e62518a59666d2a059b62':
  Add TEMP_FAILURE_RETRY macro for darwin
 2012-10-13 13:54:34 -07:00
Kenny Root 51ccef27ca Merge "Add TEMP_FAILURE_RETRY macro for darwin" 2012-10-13 13:12:40 -07:00
Kenny Root 89c2812bd6 Add TEMP_FAILURE_RETRY macro for darwin 
Darwin doesn't define the TEMP_FAILURE_RETRY macro in unistd.h so we
need to add it everywhere. Joy!

(cherry picked from commit ec90f1dc11)

Change-Id: Ida554fc65193672cc4616dec79e6282e06cc1b28
 2012-10-13 12:35:03 -07:00
Kenny Root ec90f1dc11 Add TEMP_FAILURE_RETRY macro for darwin 
Darwin doesn't define the TEMP_FAILURE_RETRY macro in unistd.h so we
need to add it everywhere. Joy!

Change-Id: Ida554fc65193672cc4616dec79e6282e06cc1b28
 2012-10-13 12:33:11 -07:00
Kenny Root c5333e494d am 1dc92bac: am 207c17ff: Merge "Make adb robust against EINTR" 
* commit '1dc92bacb8cbf052438e0b1af4030a57901d6e94':
  Make adb robust against EINTR
 2012-10-13 00:01:37 -07:00