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

11623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andres Morales
03e45da4fe am 49beb7e0: Merge "property_service: Added vendor build properties to load_all_props" 
* commit '49beb7e01be1c7a9914371fb6f8d2c9d76c46a7e':
  property_service: Added vendor build properties to load_all_props
 2015-01-14 16:09:02 +00:00
Andres Morales
49beb7e01b Merge "property_service: Added vendor build properties to load_all_props" 2015-01-14 15:56:04 +00:00
Andres Morales
1f1b058e35 property_service: Added vendor build properties to load_all_props 
Change-Id: Id50a6dd7fd40752efff8a327ea6b4a45b07fc1b2
 2015-01-13 18:18:41 -08:00
Riley Andrews
8ee7ff7536 am fc2bdfa3: Merge "Python unit test for adb." 
* commit 'fc2bdfa39581d9ca1a7204ddd8e3b2e4b32b8434':
  Python unit test for adb.
 2015-01-13 23:39:27 +00:00
Yabin Cui
2cd0563c53 am d3119b19: Merge "Add ip6-localhost to /system/etc/hosts." 
* commit 'd3119b1962ef5c0d15b9cc22beb9ded040b44dcb':
  Add ip6-localhost to /system/etc/hosts.
 2015-01-13 23:39:26 +00:00
Riley Andrews
fc2bdfa395 Merge "Python unit test for adb." 2015-01-13 23:32:09 +00:00
Yabin Cui
d3119b1962 Merge "Add ip6-localhost to /system/etc/hosts." 2015-01-13 23:28:57 +00:00
Riley Andrews
d83a9c55f4 Python unit test for adb. 
Change-Id: I1b2b8004f47b708e6a1d6a4ad20816e7beb21a0f
 2015-01-13 15:08:56 -08:00
Yabin Cui
25147416bb Add ip6-localhost to /system/etc/hosts. 
Bug: 18791191
Change-Id: Id7cad8cfccadeb319f0dc7dcba8148a457f9f87d
 2015-01-13 14:38:21 -08:00
Chih-Hung Hsieh
62ea6b268f am ce1928e9: Merge "Add required casts for clang/llvm -Wc++11-narrowing" 
* commit 'ce1928e987923a276ff048c69d9a6f43f22610ba':
  Add required casts for clang/llvm -Wc++11-narrowing
 2015-01-13 17:51:27 +00:00
Chih-Hung Hsieh
ce1928e987 Merge "Add required casts for clang/llvm -Wc++11-narrowing" 2015-01-13 17:38:06 +00:00
Elliott Hughes
14a137325e am 227f8bf1: Merge "Clean up adb Win32 symlink #ifdefs." 
* commit '227f8bf1474a9822ac5b4a9c529af1849bdac417':
  Clean up adb Win32 symlink #ifdefs.
 2015-01-13 01:31:54 +00:00
Elliott Hughes
227f8bf147 Merge "Clean up adb Win32 symlink #ifdefs." 2015-01-13 01:05:20 +00:00
Elliott Hughes
0a049b1d8d Clean up adb Win32 symlink #ifdefs. 
Change-Id: I83ef30e82d820f91960c29f6b737e6e900caaca6
 2015-01-12 17:00:09 -08:00
Chih-Hung Hsieh
ba8cdf99a4 Add required casts for clang/llvm -Wc++11-narrowing 
system/core/include/utils/Mutex.h:134:25: error: non-constant-expression
cannot be narrowed from type 'long long' to '__kernel_time_t' (aka
'long') in initializer list [-Wc++11-narrowing]

system/core/include/utils/Mutex.h:135:26: error: non-constant-expression
cannot be narrowed from type 'long long' to 'long' in initializer list
[-Wc++11-narrowing]

Change-Id: Icb9df26aeb01617da5ab1c36987289f7c2b11954
 2015-01-12 16:53:52 -08:00
Elliott Hughes
4d9ddb14c0 am ec556521: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER." 
* commit 'ec556521e23f66ea52e41a7d9540b2dec31766c5':
  Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
 2015-01-12 22:28:11 +00:00
Elliott Hughes
ec556521e2 Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER." 2015-01-12 22:16:57 +00:00
Elliott Hughes
ae52165490 Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER. 
Change-Id: I3d92dbecebd2bb449a8c4332de684919a58847ad
 2015-01-12 13:56:34 -08:00
Elliott Hughes
508a1a4df7 am 9da414f9: Merge "Linux always has POSIX clocks available." 
* commit '9da414f95e06979e60b48380afbf5372c1ef0ef3':
  Linux always has POSIX clocks available.
 2015-01-10 00:42:40 +00:00
Elliott Hughes
9da414f95e Merge "Linux always has POSIX clocks available." 2015-01-10 00:34:15 +00:00
Elliott Hughes
76f0a84f6a Linux always has POSIX clocks available. 
pixelflinger doesn't have to run on the Mac, but the Condition
code might.

Change-Id: Ib4e9b4daa6e848ffd5742959427b172d45f08e3c
 2015-01-09 16:17:46 -08:00
Elliott Hughes
55410c4e62 am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>." 
* commit '4c6c6d1c7ed7d8481d717f949c18657efa5533af':
  You either have winsock or <sys/sockets.h>.
 2015-01-09 22:02:26 +00:00
Elliott Hughes
4c6c6d1c7e Merge "You either have winsock or <sys/sockets.h>." 2015-01-09 21:52:15 +00:00
Elliott Hughes
3906c8511e You either have winsock or <sys/sockets.h>. 
There is no third choice.

Change-Id: I8f1206f22798f747896dd53f3081cdfa4b1707c4
 2015-01-09 12:21:51 -08:00
Leo Wang
8e9407506f am f2bd3fdd: Merge "Provide a way to select force encryption from vendor partition" into lmp-mr1-dev 
* commit 'f2bd3fdd190fc1234913febfe254f8bcc4e675da':
  Provide a way to select force encryption from vendor partition
 2015-01-09 02:01:31 +00:00
Leo Wang
f2bd3fdd19 Merge "Provide a way to select force encryption from vendor partition" into lmp-mr1-dev 2015-01-09 01:17:51 +00:00
Christopher R. Palmer
fda1bb9e11 am ba95be58: init: Fix memory corruption when sanitizing platform paths 
* commit 'ba95be58c596aa7b5034b1bce8f3fde97ae08780':
  init: Fix memory corruption when sanitizing platform paths
 2015-01-07 22:51:38 +00:00
Christopher R. Palmer
ba95be58c5 init: Fix memory corruption when sanitizing platform paths 
This commit fixes code that incorrectly increments s when it
hits the terminator character of the string being sanitized.
This means it will randomly start trashing memory beyond the
end of the string being sanitized until it happens to hit two
NULs (\0\0) which will break it out of the loop.

(cherry picked from commit 07f3fee164)

Bug: 18885357
Change-Id: If6b01fe2b9bd5985f08f1278deb03b311d0170dc
 2015-01-07 12:18:00 -08:00
Paul Lawrence
703b87de5b Provide a way to select force encryption from vendor partition 
This allows a vendor to force encryption on devices via a vendor
partition flag:

ro.vold.forceencryption 1

Bug: 18764230
Change-Id: Id0049ce64e34e4f6f96e593aadd70c277ac131c8
 2015-01-07 11:44:51 -08:00
Jesse Hall
ec8e7e2ccb am 7208a015: Merge "Mutex: add timedLock() method" 
* commit '7208a01514284becbd32cf4dfd256e4b10448f8e':
  Mutex: add timedLock() method
 2015-01-07 18:12:00 +00:00
Jesse Hall
7208a01514 Merge "Mutex: add timedLock() method" 2015-01-07 18:01:11 +00:00
Jesse Hall
601424a84f Mutex: add timedLock() method 
This is not available for host builds because OSX doesn't have
pthread_mutex_timedlock() or equivalent.

Bug: 18842510
Change-Id: I072e74ab1a6f770fd245828b39c5f954dda1113b
 2015-01-07 08:06:51 -08:00
Yabin Cui
28175b0221 am fdb3da59: Merge "Use getmntent when accessing /proc/mounts." 
* commit 'fdb3da5953b70dc87a05d28c31cb0dc06b8181aa':
  Use getmntent when accessing /proc/mounts.
 2015-01-06 18:17:41 +00:00
Yabin Cui
fdb3da5953 Merge "Use getmntent when accessing /proc/mounts." 2015-01-06 17:41:40 +00:00
Sami Tolvanen
e8f0971cc8 am 4f8fa5ba: Merge "Fix disable-verity when the underlying block device is RO" 
* commit '4f8fa5ba3c3abef02023a219602df8880deaedf6':
  Fix disable-verity when the underlying block device is RO
 2015-01-06 11:23:51 +00:00
Sami Tolvanen
4f8fa5ba3c Merge "Fix disable-verity when the underlying block device is RO" 2015-01-06 11:12:42 +00:00
Yabin Cui
d6bd9bf459 Use getmntent when accessing /proc/mounts. 
Bug: 18887435
Change-Id: I6d7f95bbdb976428d4722bd640745e73c9839160
 2015-01-05 20:28:36 -08:00
Sami Tolvanen
13449cd714 Fix disable-verity when the underlying block device is RO 
If verity is enabled and the underlying block device is marked
read-only, disable-verity fails. We cannot use the existing code
for enable-verity to make the device writable as the device in
/proc/mounts will be the verity device instead of the underlying
device we want to change. This change makes the correct device
writable when altering verity state.

Change-Id: I423ee50fb34d78cff2fe843318b9081c03c5142d
 2015-01-05 20:31:25 +00:00
Mark Salyzyn
aeeaee58a1 am e892279b: Merge "liblog: Add log_time += operator" 
* commit 'e892279b3a29060d873bd65e55b3a613e61fe04d':
  liblog: Add log_time += operator
 2015-01-05 20:24:57 +00:00
Mark Salyzyn
e892279b3a Merge "liblog: Add log_time += operator" 2015-01-05 20:18:24 +00:00
Mark Salyzyn
decd92945f liblog: Add log_time += operator 
Change-Id: I1d2987b6cb333fc344d4fee1b7bb25f32a4143c6
 2015-01-05 16:27:54 +00:00
Elliott Hughes
9c359a3dd2 am 69159ba0: Merge "Fix missing #includes in system/core." 
* commit '69159ba0b70178a24e6f592dfb9d903629c23a09':
  Fix missing #includes in system/core.
 2014-12-30 12:21:10 +00:00
Elliott Hughes
69159ba0b7 Merge "Fix missing #includes in system/core." 2014-12-29 21:17:41 +00:00
Elliott Hughes
0badbd6565 Fix missing #includes in system/core. 
Change-Id: I4736e8c4f7bb8bb03640d26d58243efaa67dc75c
 2014-12-29 12:24:25 -08:00
Elliott Hughes
7010c4a5d3 am 2978ad4c: Merge "Remove two obsolete files." 
* commit '2978ad4c6d660f02ff0a1742749b6818b2616b69':
  Remove two obsolete files.
 2014-12-24 20:04:54 +00:00
Elliott Hughes
2978ad4c6d Merge "Remove two obsolete files." 2014-12-24 19:55:24 +00:00
Elliott Hughes
2215309987 Remove two obsolete files. 
Change-Id: I3e40dc713435f5c653c1aff28a450fd3fb75055c
 2014-12-24 11:52:50 -08:00
Elliott Hughes
b01c52aac2 am d106305f: Merge "Lose getenforce and setenforce to toybox." 
* commit 'd106305f67b71653d4409a416c69796cbcc948e8':
  Lose getenforce and setenforce to toybox.
 2014-12-24 19:51:55 +00:00
Elliott Hughes
d106305f67 Merge "Lose getenforce and setenforce to toybox." 2014-12-24 19:40:54 +00:00
Elliott Hughes
2e67705cff Lose getenforce and setenforce to toybox. 
Change-Id: Ie03161cc2d6ae410e079e1142e62e6836858c9db
 2014-12-24 11:31:14 -08:00