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

4760 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Kenny Root
1dc92bacb8 am 207c17ff: Merge "Make adb robust against EINTR" 
* commit '207c17ff1f48d0db3c69628bb036a14db40b5887':
  Make adb robust against EINTR
 2012-10-12 23:59:22 -07:00
Kenny Root
207c17ff1f Merge "Make adb robust against EINTR" 2012-10-12 23:45:47 -07:00
The Android Automerger
b151510bee merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:43 -07:00
The Android Automerger
a26ee499a7 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 16:33:07 -07:00
Dima Zavin
bb10d89a54 am 657cd838: am 9b4a9312: am 209c7b0f: charger: allow devices to skip the initial display blank 
* commit '657cd83899355c7f488dcd3294a523ec120f840f':
  charger: allow devices to skip the initial display blank
 2012-10-12 15:55:47 -07:00
Dima Zavin
657cd83899 am 9b4a9312: am 209c7b0f: charger: allow devices to skip the initial display blank 
* commit '9b4a9312dc1c158ae28ce3f3a2f6ebf16fd94ff1':
  charger: allow devices to skip the initial display blank
 2012-10-12 15:53:48 -07:00
Dima Zavin
9b4a9312dc am 209c7b0f: charger: allow devices to skip the initial display blank 
* commit '209c7b0fad9604d1dde1b74d9f9d577b923469fd':
  charger: allow devices to skip the initial display blank
 2012-10-12 15:52:07 -07:00
Kenny Root
73167412bc Make adb robust against EINTR 
Change-Id: I39a8d9007ce2d5662a33a50e4d7e2e7f8f9fad63
 2012-10-12 15:28:37 -07:00
Dima Zavin
209c7b0fad charger: allow devices to skip the initial display blank 
The theory behind the blank was that the kernel would not
re-initilize the display on boot (and leave it to whatever
the bootloader configured it to) until after the first
blank request.

On some devices, the bootloader does not turn the screen on,
but it's done by the kernel and thus. This makes the extra blank at
start unnecessary.

Bug: 7319529
Change-Id: I9ad9856186df6e9e23ebbe86e83b641423e16dcb
Signed-off-by: Dima Zavin <dima@android.com>
 2012-10-12 15:13:52 -07:00
The Android Open Source Project
c189f4a026 am e34e9e49: (-s ours) Reconcile with jb-mr1-factory-release - do not merge 
* commit 'e34e9e498ac6910fc7c9a34aca010febcc750e7f':
 2012-10-12 07:33:41 -07:00
The Android Open Source Project
e34e9e498a Reconcile with jb-mr1-factory-release - do not merge 
Change-Id: I8c44904def148550022af390ceda87a2d4007c48
 2012-10-12 07:32:27 -07:00