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

5863 Commits

Author SHA1 Message Date
Colin Cross 42cf2b5945 fix windows build 
thread_defs.h gets included by the windows host libandroidfw build,
which does not have sys/cdefs.h or BEGIN_DECLS.  Switch to using
extern "C" manually.

Change-Id: I363e6f2d3a64c5efeff54049a2e5dab080fd4715
 2013-07-23 19:58:03 -07:00
Alex Ray 511f9efff7 Merge "cutils: add thread_defs header" 2013-07-24 00:37:28 +00:00
Alex Ray 8a84c71acb cutils: add thread_defs header 
Change-Id: I3b70054d9f9740a5980df514221de07df55e7176
 2013-07-23 17:16:24 -07:00
Glenn Kasten f7326dc0aa Valid channel mask must have at least one channel 
Also:
 - Use correct type name audio_channel_mask_t
 - Use the parameter name 'channelMask' instead of the more ambiguous 'channels'

Change-Id: I22bc1821a1bded0e69fe7d99e7b981ff60d77cee
 2013-07-23 16:47:17 -07:00
Colin Cross 776751ad79 am 8c4b1539: am f9873987: am 5954ecb8: Merge "Allow more characters in partition name links" 
* commit '8c4b153911e399f00fdf0ed4e39782d0d49396d6':
  Allow more characters in partition name links
 2013-07-22 15:45:42 -07:00
Colin Cross 8c4b153911 am f9873987: am 5954ecb8: Merge "Allow more characters in partition name links" 
* commit 'f987398723b06538821162dadde7d7d2c9e0fb29':
  Allow more characters in partition name links
 2013-07-22 15:42:53 -07:00
Colin Cross f987398723 am 5954ecb8: Merge "Allow more characters in partition name links" 
* commit '5954ecb87b8c77425d8cc766c0cc798957a07a7d':
  Allow more characters in partition name links
 2013-07-22 15:40:55 -07:00
Colin Cross 5954ecb87b Merge "Allow more characters in partition name links" 2013-07-22 22:39:37 +00:00
The Android Open Source Project 70cdc26dfc am ef6ef967: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'ef6ef9673ddd66861e51ef077ff3cbe8cb7fe0e1':
  init: Increase maximum number of Android properties to 372
 2013-07-22 08:01:59 -07:00
The Android Open Source Project ef6ef9673d Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I686cdf493c592d52eb2718fa4e42f22b902dd84c
 2013-07-22 07:59:25 -07:00
The Android Open Source Project f1ae7bd998 am b441a2b9: Merge 821678e1 
* commit 'b441a2b930b5a85ea0189fbb99618823bf560037':
  init: Increase maximum number of Android properties to 372
 2013-07-22 07:58:31 -07:00
The Android Open Source Project b441a2b930 Merge 821678e1 
Change-Id: Ia6b827e03d8a62c4682e304a4f7f3b839c8cbbc3
 2013-07-22 07:54:19 -07:00
Ajay Dudani 6647bf7285 init: Increase maximum number of Android properties to 372 
Bug: 9941046 -- encryption failed
Change-Id: Ib9c2921a2b574542cce98d2eadbd9204a1ad0bf0
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2013-07-21 10:22:33 -07:00
Ajay Dudani 821678e1c7 init: Increase maximum number of Android properties to 372 
Bug: 9941046 -- encryption failed
Change-Id: Ib9c2921a2b574542cce98d2eadbd9204a1ad0bf0
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2013-07-21 09:30:17 -07:00
The Android Open Source Project b37f3fe9e5 am 56884c62: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '56884c62d2959c0023cf16f34707ca98c4d38279':
  Add writable data space for radio.
 2013-07-19 16:02:28 -07:00
Robert Greenwalt f498ec8faf am dafa66af: am 2aa33a3d: Add writable data space for radio. 
* commit 'dafa66afdd3729e2c65ccb8dced8ca3e137db437':
  Add writable data space for radio.
 2013-07-19 16:02:06 -07:00
The Android Open Source Project 56884c62d2 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I428d9dcbe7008645e5dbf3a35946a6de34229299
 2013-07-19 14:21:08 -07:00
Robert Greenwalt dafa66afdd am 2aa33a3d: Add writable data space for radio. 
* commit '2aa33a3dbd1147558098d9a2948450d363ffe468':
  Add writable data space for radio.
 2013-07-19 13:42:54 -07:00
Robert Greenwalt d6f4c27a13 Add writable data space for radio. 
Storing carrier provisioning urls updates in /data/misc/radio.
bug:9623159

Change-Id: I8d62d4638229733dea0f11f1729c4d22ae2295d1
I36697ed341353b7a3dbec5afe20241102e76f6f1
 2013-07-18 11:25:02 -07:00
Johan Redestig 93ca79b445 Allow more characters in partition name links 
We have several partitions with underscores in their names
which would not be properly linked in:
/dev/block/platform/msm_sdcc.1/by-name/

With this change more characters (_-.) are allowed in
partition name links. Also, any other character is
replaced with '_' so the resulting link names have the
same length as the partition name.

Change-Id: I746566c03db98b10326c755692362d2c10e528ae
 2013-07-18 10:06:01 +02:00
Jeff Brown 57fc1ceebc Split framework jar. 
Change-Id: I590de05f23669cf625030b479c786423f21c6159
 2013-07-17 20:30:12 -07:00
Robert Greenwalt 2aa33a3dbd Add writable data space for radio. 
Storing carrier provisioning urls updates in /data/misc/radio.
bug:9623159

Change-Id: I8d62d4638229733dea0f11f1729c4d22ae2295d1
I36697ed341353b7a3dbec5afe20241102e76f6f1
 2013-07-16 17:18:46 -07:00
Elliott Hughes 0246f8f6f6 am a570312a: am f265426f: am 596ee9ea: Merge "Improve the crasher stack-overflow command." 
* commit 'a570312a56938f6ebfcadc3ec9830ab8a2407654':
  Improve the crasher stack-overflow command.
 2013-07-16 10:24:44 -07:00
Elliott Hughes a570312a56 am f265426f: am 596ee9ea: Merge "Improve the crasher stack-overflow command." 
* commit 'f265426f020162b9e8c20fb051f613de3640254b':
  Improve the crasher stack-overflow command.
 2013-07-16 10:23:03 -07:00
Elliott Hughes f265426f02 am 596ee9ea: Merge "Improve the crasher stack-overflow command." 
* commit '596ee9ea8ae37b17fbdff91508f55250d528f1d2':
  Improve the crasher stack-overflow command.
 2013-07-16 10:21:22 -07:00
Elliott Hughes 596ee9ea8a Merge "Improve the crasher stack-overflow command." 2013-07-16 17:19:58 +00:00
Elliott Hughes b1be27e29b Improve the crasher stack-overflow command. 
Runs a lot quicker, with no intermediate noise.

Change-Id: Icd911ff305da2e0889029dc78d5c2b39f32111c5
 2013-07-15 17:19:02 -07:00
Jeff Brown 3884a9b252 init.rc: Add input flinger. 
Change-Id: Ibcb1116bdcd9189272db620910b9958c8ffb4552
 2013-07-15 15:08:39 -07:00
Nick Kralevich 459d879160 Merge "init: call restorecon on /sys" 2013-07-15 21:58:04 +00:00
Rom Lemarchand 4a291b339e Merge "init.rc: configure memory cgroups" 2013-07-15 21:11:40 +00:00
Nick Kralevich 56adf99267 am 9a4913d4: init.rc: remove "on fs" section 
* commit '9a4913d422f4c18033333afe8e2e1d699b112d44':
  init.rc: remove "on fs" section
 2013-07-15 13:28:44 -07:00
Nick Kralevich f29c533c49 init: call restorecon on /sys 
Not all files on /sys are not getting labeled properly. Fix them.

Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
 2013-07-15 13:10:02 -07:00
Rom Lemarchand 435a52ef07 init.rc: configure memory cgroups 
Create the memory cgroups folders and configure them

Change-Id: I06c4bb486b204f7e98b0bc6757deec8bd7f6349e
 2013-07-15 12:43:47 -07:00
Nick Kralevich 9a4913d422 init.rc: remove "on fs" section 
This was only ever used by the emulator. Now the emulator
uses an fstab file.

Change-Id: I1a071e567e1f1a379f9c8079cc2dc17660d8455f
 2013-07-12 13:48:50 -07:00
Nick Kralevich e1dbdd6978 am 7d6ddc7d: am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs" 
* commit '7d6ddc7d395e909d841bb7eadfc12a167076aecf':
  use ext4 instead of yaffs
 2013-07-12 11:22:00 -07:00
Nick Kralevich 7d6ddc7d39 am 2713be91: am fb1c9cf6: Merge "use ext4 instead of yaffs" 
* commit '2713be91a84078e8b0b9b755ce17881b750e85a7':
  use ext4 instead of yaffs
 2013-07-12 11:20:15 -07:00
Nick Kralevich 2713be91a8 am fb1c9cf6: Merge "use ext4 instead of yaffs" 
* commit 'fb1c9cf6fa4efafb3e0c6b0bc93c7f087d926a48':
  use ext4 instead of yaffs
 2013-07-12 11:18:26 -07:00
Nick Kralevich fb1c9cf6fa Merge "use ext4 instead of yaffs" 2013-07-12 18:16:48 +00:00
Elliott Hughes 81274e9e6c am 6b78fad1: am a9396549: Fix my incorrect merge resolution for 132b7d750e harder. 
* commit '6b78fad147c772075eae5cfc25f5a50748bc4015':
  Fix my incorrect merge resolution for 132b7d750e harder.
 2013-07-11 19:12:18 -07:00
Elliott Hughes 6b78fad147 am a9396549: Fix my incorrect merge resolution for 132b7d750e harder. 
* commit 'a9396549b37d13c518c662c04f6ff42e9ae47c24':
  Fix my incorrect merge resolution for 132b7d750e harder.
 2013-07-11 19:10:01 -07:00
Elliott Hughes a9396549b3 Fix my incorrect merge resolution for 132b7d750e harder. 
Change-Id: I3f8bc955f035b49407540053462e53b3f262d381
 2013-07-11 19:07:06 -07:00
Elliott Hughes ae118966da am 43564031: am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e. 
* commit '435640312ce48dab201d6f26a6258143a82f551e':
  Fix my incorrect merge resolution for 132b7d750e.
 2013-07-11 19:05:32 -07:00
Elliott Hughes 435640312c am 7b9c33b1: Fix my incorrect merge resolution for 132b7d750e. 
* commit '7b9c33b1e0e47f72d0af35d8a948900697da5871':
  Fix my incorrect merge resolution for 132b7d750e.
 2013-07-11 19:01:36 -07:00
Elliott Hughes 7b9c33b1e0 Fix my incorrect merge resolution for 132b7d750e. 
The conflict was the actual intended change.

Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b
 2013-07-11 18:58:07 -07:00
Elliott Hughes ad989d038e am dccd7773: am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master 
* commit 'dccd77730754b681f3517308359a34f86aecd99f':
  fs_mgr_priv: Extend fs wait timeout to 20 seconds
 2013-07-11 18:52:12 -07:00
Elliott Hughes dccd777307 am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master 
* commit '786b1232d201d46f59bd9da84bfcfcb9ad80bb6c':
  fs_mgr_priv: Extend fs wait timeout to 20 seconds
 2013-07-11 18:50:25 -07:00
Elliott Hughes 786b1232d2 resolved conflicts for merge of 42031e0e to stage-aosp-master 
Change-Id: I3e6337c258b3e7fb6eee4ed8e3664a69ae219fd6
 2013-07-11 18:48:30 -07:00
Ken Sumrall 42031e0ed7 Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds" 2013-07-10 22:42:37 +00:00
Ken Sumrall a76baaabe5 Add swapon_all to init's builtin commands 
For enabling swap devices found in the fstab file

Change-Id: Iec4fd4d208df3d7a161a90d95f8606e8b516334a
 2013-07-09 18:42:09 -07:00
Nick Kralevich f4c1512db8 use ext4 instead of yaffs 
This is needed to allow the emulator to use ext4 images.

Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I02fde6382ad67cf7f4f3b695396841f70bb9301d
 2013-07-09 18:06:11 -07:00