ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4792 commits 1 branch 0 tags 217 MiB
Commit graph

4792 commits

This branch
This branch
All branches
Author SHA1 Message Date
jp abgrall
3699bcfe83 am 0069b013: am 3ddc0059: am ee854b07: Merge "Allocate a UID for clatd" 
* commit '0069b01354ab9a62acaf4547f78688429274f0ef':
  Allocate a UID for clatd
 2012-11-12 16:02:00 -08:00
jp abgrall
0069b01354 am 3ddc0059: am ee854b07: Merge "Allocate a UID for clatd" 
* commit '3ddc0059bb897c4d7d2e0c6d9812d590388480d1':
  Allocate a UID for clatd
 2012-11-12 15:58:57 -08:00
jp abgrall
3ddc0059bb am ee854b07: Merge "Allocate a UID for clatd" 
* commit 'ee854b077766a85279fa1849b537c50837d1a204':
  Allocate a UID for clatd
 2012-11-12 15:57:02 -08:00
jp abgrall
ee854b0777 Merge "Allocate a UID for clatd" 2012-11-12 14:49:50 -08:00
Ken Sumrall
2832525e70 am 1626b98c: am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev 
* commit '1626b98c5b1d4755f0f146698d487732dcc0a2cc':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices
 2012-11-12 11:52:14 -08:00
Ken Sumrall
1626b98c5b am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev 
* commit '7fd51b36dabedee4de159213237e71ba20865812':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices
 2012-11-12 11:50:22 -08:00
Ken Sumrall
7fd51b36da am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev 
* commit 'b20fa762b515b5e96c158959d8c8d0c2ff1bf46b':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices
 2012-11-12 11:48:01 -08:00
Ken Sumrall
b20fa762b5 Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev 2012-11-12 11:45:33 -08:00
The Android Open Source Project
258a0a5ac1 am 1ca4b7d2: (-s ours) am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge 
* commit '1ca4b7d26a46d7b779a687f43f2c30ea779693de':
 2012-11-08 06:31:43 -08:00
The Android Open Source Project
1ca4b7d26a am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge 
* commit '270ee0c6c62e1bcf278892094653e7ab008b3685':
 2012-11-08 06:27:03 -08:00
Xavier Ducrohet
846c686b66 am 493d04d2: am f621d62a: am c4244565: am d1e39491: Add usb vendor id for Teleepoch. 
* commit '493d04d2fec59b273a067f5ef9d908dd0b441a08':
  Add usb vendor id for Teleepoch.
 2012-11-08 06:21:12 -08:00
Xavier Ducrohet
493d04d2fe am f621d62a: am c4244565: am d1e39491: Add usb vendor id for Teleepoch. 
* commit 'f621d62adcbcd81d6479223d9afe47c1d966710d':
  Add usb vendor id for Teleepoch.
 2012-11-08 06:14:18 -08:00
The Android Open Source Project
270ee0c6c6 am ba70ed9a: Reconcile with jb-mr1-release - do not merge 
* commit 'ba70ed9ae7dab75bde317a8dc8886da309831eca':
 2012-11-07 10:24:18 -08:00
The Android Open Source Project
ba70ed9ae7 Reconcile with jb-mr1-release - do not merge 
Change-Id: I70866c059c12fdba45761ecbbb6e2a4cf2aa8107
 2012-11-07 10:20:22 -08:00
The Android Automerger
31da9db0d1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 18:04:30 -08:00
Ken Sumrall
d42d327c17 Fix fs_mgr to properly invoke e2fsck on encrypted devices 
Change-Id: Ie220f5cb7b614a48ec8afe66f4721ede3a368166
 2012-11-06 17:55:37 -08:00
Xavier Ducrohet
f621d62adc am c4244565: am d1e39491: Add usb vendor id for Teleepoch. 
* commit 'c424456542cacc7d776e1adc859ed1c0e784dee0':
  Add usb vendor id for Teleepoch.
 2012-11-06 17:10:14 -08:00
Xavier Ducrohet
c424456542 am d1e39491: Add usb vendor id for Teleepoch. 
* commit 'd1e39491f063626e026304ba8abe084cc43c94da':
  Add usb vendor id for Teleepoch.
 2012-11-06 17:07:54 -08:00
Xavier Ducrohet
d1e39491f0 Add usb vendor id for Teleepoch. 
Change-Id: I82bbfed598fc3a886681c4139600cf487034c59c
 2012-11-06 12:56:14 -08:00
The Android Open Source Project
770dd86a75 am 63766a89: (-s ours) am b64246ae: am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '63766a89a18e8476f6e4cbac505a2a827d0490ab':
 2012-11-06 12:31:12 -08:00
The Android Open Source Project
63766a89a1 am b64246ae: am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit 'b64246ae1b00eacd5323f8a8db7249bd726c4f33':
 2012-11-06 12:27:06 -08:00
The Android Open Source Project
b64246ae1b am c8e3a27b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit 'c8e3a27b43407268b2bb76b1d4fceee4fa3b314a':
  init: Set ADDR_COMPAT_LAYOUT before spawning processes.
  Dump 256 bytes per chunk pointed by general-purpose registers.
  Wrap system calls in TEMP_FAILURE_RETRY.
  Bring back ADB_EXTERNAL_STORAGE.
  Revert "Upgrade to dlmalloc 2.8.5."
  bluetooth: bring up with bluedroid stack
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
 2012-11-06 12:23:39 -08:00
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
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