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

7346 Commits

Author SHA1 Message Date
Mark Salyzyn 2e44a9ea25 liblog: deprecate export LOGGER ioctl definitions 
Change-Id: I150cad9309255bec2b8bc7230c744e9bbb1b9578
 2014-01-16 15:05:29 -08:00
Elliott Hughes ab88481dc7 Merge "resolved conflicts for merge of ec9e5891 to master" 2014-01-16 22:43:20 +00:00
Elliott Hughes b70375abc2 resolved conflicts for merge of ec9e5891 to master 
Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
 2014-01-16 14:42:35 -08:00
Doug Zongker d0f2c265d8 Merge "add the pre-recovery service" 2014-01-16 22:41:24 +00:00
Elliott Hughes ec9e5891ac am 8940c0a0: am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup." 
* commit '8940c0a07f8d6682712e2d2ee387e78096602f99':
  system/core 64-bit cleanup.
 2014-01-16 22:11:49 +00:00
Elliott Hughes 8940c0a07f am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup." 
* commit '97373bbc713c52c43e0fa48d0f16466e0a450178':
  system/core 64-bit cleanup.
 2014-01-16 22:07:32 +00:00
Elliott Hughes 97373bbc71 am 7cd15614: Merge "system/core 64-bit cleanup." 
* commit '7cd1561410473c71d40cec822fb53a282b5b3279':
  system/core 64-bit cleanup.
 2014-01-16 14:05:24 -08:00
Elliott Hughes 7cd1561410 Merge "system/core 64-bit cleanup." 2014-01-16 21:59:58 +00:00
Mark Salyzyn 24239a99ff Merge "liblog: deprecate export of LOGGER_LOG_* defines" 2014-01-16 21:51:03 +00:00
Elliott Hughes ccecf14254 system/core 64-bit cleanup. 
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.

Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
 2014-01-16 12:54:18 -08:00
Nick Kralevich 869d5933ef am 325a99fb: am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors" 
* commit '325a99fb630306ff99cc24be720061ecec7dae17':
  fs_mgr: increase verboseness on mount errors
 2014-01-16 19:26:19 +00:00
Nick Kralevich 325a99fb63 am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors" 
* commit 'bdea585e68a054552a26272ec9321afaad9ac915':
  fs_mgr: increase verboseness on mount errors
 2014-01-16 19:23:05 +00:00
Nick Kralevich bdea585e68 am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors" 
* commit 'a6b65eeef1280bbd38172d0b36b3493888e94b4b':
  fs_mgr: increase verboseness on mount errors
 2014-01-16 19:21:08 +00:00
Nick Kralevich a6b65eeef1 am 7580661d: Merge "fs_mgr: increase verboseness on mount errors" 
* commit '7580661df179eb037c0dbe96e3bde1bc9e6bfbdc':
  fs_mgr: increase verboseness on mount errors
 2014-01-16 11:19:51 -08:00
Nick Kralevich 7580661df1 Merge "fs_mgr: increase verboseness on mount errors" 2014-01-16 19:14:30 +00:00
Doug Zongker 7baebf1345 add the pre-recovery service 
Add a service called "pre-recovery" which is normally stopped but can
be started by the system server when we want to go into recovery.  It
will do any preparation needed (currently needed to handle update
packages that reside on an encrypted /data partition) and then set
sys.powerctl when it's ready to actually reboot.

Bug: 12188746
Change-Id: I894a4cb200395a0f6d7fe643ed4c2ac0a45d2052
 2014-01-16 08:54:59 -08:00
Mohamad Ayyash d70009e7ec Merge "fastboot: Make tags_offset a command line option." 2014-01-15 23:22:35 +00:00
Glenn Kasten 112cf35d4d Merge "Miscellaneous updates to <system/audio.h>" 2014-01-15 23:11:32 +00:00
Glenn Kasten 1c3e16fb40 Miscellaneous updates to <system/audio.h> 
Add single-precision floating-point PCM format:
    - AUDIO_FORMAT_PCM_SUB_FLOAT
    - AUDIO_FORMAT_PCM_FLOAT

Add symbols to replace hard-coded constants in code:
    - AUDIO_IO_HANDLE_NONE
    - AUDIO_IN_ACOUSTICS_NONE
    - AUDIO_INTERLEAVE_*
    - AUDIO_STREAM_MIN

Update comments.

Fix whitespace in switch statement.

Change-Id: I61862c188ebac06657b5d9887164edc24b8ab8f5
 2014-01-15 14:11:27 -08:00
Nick Kralevich 32a32c9eb2 am 11190d0c: am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media." 
* commit '11190d0ccb1216307043ceecf5360f1a1a946cd1':
  restorecon /data/misc/media.
 2014-01-15 20:22:16 +00:00
Nick Kralevich 11190d0ccb am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media." 
* commit '4552987e6a1338dac26f13f0851657335d998ffb':
  restorecon /data/misc/media.
 2014-01-15 20:19:31 +00:00
Nick Kralevich 4552987e6a am c93904b4: am e847f429: Merge "restorecon /data/misc/media." 
* commit 'c93904b445830cd17fd9dd6d4fe236987577a478':
  restorecon /data/misc/media.
 2014-01-15 20:15:56 +00:00
Nick Kralevich c93904b445 am e847f429: Merge "restorecon /data/misc/media." 
* commit 'e847f429f43ae56aaa406697ca603c8469e2100b':
  restorecon /data/misc/media.
 2014-01-15 12:13:20 -08:00
Nick Kralevich e847f429f4 Merge "restorecon /data/misc/media." 2014-01-15 20:06:52 +00:00
William Roberts 071f28ae0e fs_mgr: increase verboseness on mount errors 
While debugging a mount error, the dmesg output was less
than ideal. The error would be declared but why the mount
failed, and what options were passed was not present. This
patch ensures that the mount options and underlying
errno are printed.

Change-Id: I2b3a2c113149df878c0a8a10ef86fd9e4f909658
 2014-01-15 13:26:26 -05:00
Mohamad Ayyash bdf513c5f2 fastboot: Make tags_offset a command line option. 
This matches what mkbootimg supports in 5d4af6314fded027952941110a520dc9aa234a14

It will allow "fastboot flash:raw ..." to work for devices that need tags_offset.

Change-Id: I4ceca528f88cc8ede5742f8a67bec972e41eebe7
 2014-01-15 18:25:09 +00:00
Stephen Smalley 9e9f05e5eb restorecon /data/misc/media. 
Otherwise it will be mislabeled on upgrades with existing userdata.

Change-Id: Ibde88d5d692ead45b480bb34cfe0831baeffbf94
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-01-15 13:19:31 -05:00
Nick Kralevich c318fb405b am 7a2c2e80: am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter"" 
* commit '7a2c2e8048cc6bba9b78be8a01c0b056b5548718':
  Revert "fs_mgr: correct warning on unused function parameter"
 2014-01-15 07:48:15 +00:00
Nick Kralevich 11268294f3 am f6070528: am eca8ea82: am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter" 
* commit 'f6070528844d41d70b22461df85e5a714e5f9924':
  fs_mgr: correct warning on unused function parameter
 2014-01-15 07:48:14 +00:00
Nick Kralevich 7a2c2e8048 am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter"" 
* commit 'aa25204f43421fe363238176d74e68eb8cdb5b01':
  Revert "fs_mgr: correct warning on unused function parameter"
 2014-01-15 06:32:54 +00:00
Nick Kralevich aa25204f43 am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter"" 
* commit '93557002e17dbda49650d198c11e78ff413c8ad4':
  Revert "fs_mgr: correct warning on unused function parameter"
 2014-01-15 06:29:49 +00:00
Nick Kralevich 93557002e1 am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter"" 
* commit '37fd839fc26b9b3da451a3cb23da6e49c6b676d9':
  Revert "fs_mgr: correct warning on unused function parameter"
 2014-01-14 22:26:03 -08:00
Nick Kralevich 37fd839fc2 Merge "Revert "fs_mgr: correct warning on unused function parameter"" 2014-01-15 06:20:42 +00:00
Nick Kralevich bc7776716a Revert "fs_mgr: correct warning on unused function parameter" 
The build is broken.

system/core/fs_mgr/fs_mgr.c:824:77: error: expected '(' before 'unused'
                      const char *blk_device, long long length  __attribute__(unused))
                                                                             ^
system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry':
system/core/fs_mgr/fs_mgr.c:824:56: warning: unused parameter 'length' [-Wunused-parameter]
                      const char *blk_device, long long length  __attribute__(unused))
                                                        ^
make: *** [out/target/product/generic_x86/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr.o] Error 1
make: *** Waiting for unfinished jobs....
This reverts commit 21095d0cae.

Change-Id: I64f8c4d9c17c0e3bbf2eb427a2c0b81bbe66ec3a
 2014-01-15 06:18:54 +00:00
Nick Kralevich f607052884 am eca8ea82: am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter" 
* commit 'eca8ea823b38661dce0aa0bd88b94a32381d779b':
  fs_mgr: correct warning on unused function parameter
 2014-01-15 06:06:54 +00:00
Nick Kralevich eca8ea823b am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter" 
* commit 'e220e9e06d8a09fc1e18d19b758636dd14c13821':
  fs_mgr: correct warning on unused function parameter
 2014-01-15 06:04:59 +00:00
Nick Kralevich e220e9e06d am 7169b230: Merge "fs_mgr: correct warning on unused function parameter" 
* commit '7169b2303d9340b3537e5059f1790a246490b899':
  fs_mgr: correct warning on unused function parameter
 2014-01-14 22:03:29 -08:00
Nick Kralevich 7169b2303d Merge "fs_mgr: correct warning on unused function parameter" 2014-01-15 05:57:33 +00:00
Nick Kralevich 39e63b53bc am 42acb531: Merge "Remove obsolete vdc call." into klp-modular-dev 
* commit '42acb5314c8fb01f426e946392c248fde3371aff':
  Remove obsolete vdc call.
 2014-01-15 03:22:22 +00:00
Nick Kralevich 42acb5314c Merge "Remove obsolete vdc call." into klp-modular-dev 2014-01-15 03:18:57 +00:00
Elliott Hughes ef53917406 am 7dee721e: am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace." 
* commit '7dee721eb3387fff695e5b5a3480428bccb3cf70':
  Copy the bionic -fstack-protector hack into libbacktrace.
 2014-01-15 01:00:47 +00:00
Elliott Hughes 7dee721eb3 am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace." 
* commit '42e82f80fef7b1f13c9c3ab184cea065f4f4edbc':
  Copy the bionic -fstack-protector hack into libbacktrace.
 2014-01-15 00:57:41 +00:00
Elliott Hughes 42e82f80fe am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace." 
* commit '4a8996fb42d2114fee344b75acb23d5b0e9c548d':
  Copy the bionic -fstack-protector hack into libbacktrace.
 2014-01-15 00:55:00 +00:00
Elliott Hughes 4a8996fb42 am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace." 
* commit '3352c5037526e1f5cd3291a4853c497e488b824c':
  Copy the bionic -fstack-protector hack into libbacktrace.
 2014-01-14 16:52:33 -08:00
Elliott Hughes 3352c50375 Merge "Copy the bionic -fstack-protector hack into libbacktrace." 2014-01-15 00:46:48 +00:00
Elliott Hughes 1380ddcab2 Copy the bionic -fstack-protector hack into libbacktrace. 
aarch64 doesn't support -fstack-protector yet.

Change-Id: Id1e589742ba074f59d3390d059248c9b371aff58
 2014-01-14 16:44:31 -08:00
Elliott Hughes 57a6fbfb9a am b6e70fce: am 57f22625: am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit." 
* commit 'b6e70fce5365c596a7b0b22cd3ba75c5d7ef6430':
  Fix fastbootd build for 64-bit.
 2014-01-15 00:38:55 +00:00
Nick Kralevich 225459a5da Remove obsolete vdc call. 
Since ca8e66a8b0, init has
been handling reboots and filesystem unmounts. Remove obsolete
call to vdc.

Bug: 12504045
Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
 2014-01-14 16:38:45 -08:00
Elliott Hughes b6e70fce53 am 57f22625: am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit." 
* commit '57f226256659eca3cf06233d74761ca9c37d51b2':
  Fix fastbootd build for 64-bit.
 2014-01-15 00:36:28 +00:00
Elliott Hughes 57f2262566 am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit." 
* commit 'ea8dcdcf64781ae83574bdad9e55cd78ea0e5d1d':
  Fix fastbootd build for 64-bit.
 2014-01-15 00:33:28 +00:00