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

24113 commits

This branch
This branch
All branches
Author SHA1 Message Date
Android Build Merger (Role)
9953098973 Merge "Merge \\\"RefBase: Silence compiler warnings\\\" am: f76ca2a43b am: 3b43562535 am: 0c9b9ec4dc" into nyc-mr1-dev-plus-aosp 2016-07-12 00:18:18 +00:00
Android Build Merger (Role)
6c3eeb09c6 Merge "Merge \\\"Convert libbase Android.mk to Android.bp\\\" am: df252716f6 am: 3407c053c3 am: c5ba0110d4" into nyc-mr1-dev-plus-aosp 2016-07-12 00:18:13 +00:00
Greg Kaiser
e3d5dfb514 Merge \\\"RefBase: Silence compiler warnings\\\" am: f76ca2a43b am: 3b43562535 
am: 0c9b9ec4dc

Change-Id: I5ad8747c490bf655ced9f58ecfec2e9c3ed8c436
 2016-07-12 00:18:06 +00:00
Colin Cross
a83fc4b7ff Merge \\\"Convert libbase Android.mk to Android.bp\\\" am: df252716f6 am: 3407c053c3 
am: c5ba0110d4

Change-Id: Idb8879e480eb176f437dbdb9fb82c0aaaa1b48f9
 2016-07-12 00:18:06 +00:00
Tim Kryger
f3d454f882 Merge \"Remove attempt to write sched_compat_yield\" into nyc-mr1-dev 
am: 3f947d1c58

Change-Id: If1b1b2d7e74a4ed088e2c96b1c92d6d9d9a37704
 2016-07-12 00:18:02 +00:00
Greg Kaiser
0c9b9ec4dc Merge \\"RefBase: Silence compiler warnings\\" am: f76ca2a43b 
am: 3b43562535

Change-Id: Ifc19df587c4f0ef993200fdb6757fe3f3813bc67
 2016-07-12 00:17:48 +00:00
Colin Cross
c5ba0110d4 Merge \\"Convert libbase Android.mk to Android.bp\\" am: df252716f6 
am: 3407c053c3

Change-Id: Ie9e2684c451d6591f5778ad320a8d534331ba557
 2016-07-12 00:15:36 +00:00
Greg Kaiser
3b43562535 Merge \"RefBase: Silence compiler warnings\" 
am: f76ca2a43b

Change-Id: I4a146e36db49fc336baa7a59f8fbea0ca1dbb084
 2016-07-12 00:15:19 +00:00
Colin Cross
3407c053c3 Merge \"Convert libbase Android.mk to Android.bp\" 
am: df252716f6

Change-Id: Ia7b88a586bb06ba3a86db7afc65eb38b8cf82241
 2016-07-12 00:13:02 +00:00
Treehugger Robot
f76ca2a43b Merge "RefBase: Silence compiler warnings" 2016-07-12 00:10:24 +00:00
Treehugger Robot
df252716f6 Merge "Convert libbase Android.mk to Android.bp" 2016-07-12 00:10:10 +00:00
TreeHugger Robot
3f947d1c58 Merge "Remove attempt to write sched_compat_yield" into nyc-mr1-dev 2016-07-12 00:09:03 +00:00
Tim Murray
b386d72266 Merge \"Add support for background stune group.\" into nyc-mr1-dev 
am: 531bdd5a2c

Change-Id: Ia3be10db68dffc44e2d70535544c7c59d0933f7d
 2016-07-11 23:55:17 +00:00
Tim Murray
531bdd5a2c Merge "Add support for background stune group." into nyc-mr1-dev 2016-07-11 23:21:12 +00:00
Greg Kaiser
d9885e7edb RefBase: Silence compiler warnings 
We comment out the names of the parameters we're intentionally
not using.

(cherrypick of 44a0eb4d8cdf4ab881f5d5a1acc1155266a46f6a.)

Change-Id: I0a92d9200ca26cdc4700d2ff9e3ab33c102520d5
 2016-07-11 16:11:30 -07:00
Irina Patru
ddb0f3c612 Merge \"init.rc: Remove cpu weight set on the root cgroup\" into nyc-mr1-dev 
am: ac957cbd72

Change-Id: I00c942a5d3e283efe40541c12f7daac2d2c77770
 2016-07-11 22:29:13 +00:00
Tim Kryger
f3e1f13d81 Remove attempt to write sched_compat_yield 
The sched_compat_yield option was eliminated in Linux 2.6.38 by commit
ac53db596cc0 ("sched: Use a buddy to implement yield_task_fair()") and
as a result, the following error is printed to the log during boot up.

init: write_file: Unable to open '/proc/sys/kernel/sched_compat_yield':
No such file or directory"

Bug: 30034121
Change-Id: Idbdb68de0cb3ab1f67d82a4d66af880bcfdfe261
(cherry picked from commit 724dfbac70)
 2016-07-11 15:22:50 -07:00
TreeHugger Robot
ac957cbd72 Merge "init.rc: Remove cpu weight set on the root cgroup" into nyc-mr1-dev 2016-07-11 22:20:22 +00:00
Tim Kryger
3886aaeae4 Merge \\\"Remove attempt to write sched_compat_yield\\\" am: 3f2db32b8c am: 49a986bf73 
am: f789bd0133

Change-Id: I7434b27cf1662543efbe7b5d9fee6bac16cc9f26
 2016-07-11 21:44:49 +00:00
Tim Kryger
f789bd0133 Merge \\"Remove attempt to write sched_compat_yield\\" am: 3f2db32b8c 
am: 49a986bf73

Change-Id: Ia7770ca197adfa050a773fb514b8033717a78407
 2016-07-11 21:34:09 +00:00
Tim Kryger
49a986bf73 Merge \"Remove attempt to write sched_compat_yield\" 
am: 3f2db32b8c

Change-Id: I13c56436dd00cf2d5336ba757ae2c32d2e2504b5
 2016-07-11 21:31:08 +00:00
Tim Kryger
3f2db32b8c Merge "Remove attempt to write sched_compat_yield" 2016-07-11 21:24:52 +00:00
Colin Cross
fc06bd0ca3 Convert libbase Android.mk to Android.bp 
Change-Id: I429d0a06c5138c3e54c9d25f15adb3e2647496e1
 2016-07-11 14:23:32 -07:00
Elliott Hughes
a38bb11ff4 resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d 
am: a7cb85ce8e

Change-Id: Ice3e018e5f116571e5dadea64a28a176d6324583
 2016-07-11 21:06:42 +00:00
Elliott Hughes
a7cb85ce8e resolve merge conflicts of 743b0c5 to stage-aosp-master 
am: 619875061d

Change-Id: Iafbb322783f81cf16468afafaf97be701aa6c9ef
 2016-07-11 21:03:57 +00:00
Elliott Hughes
619875061d resolve merge conflicts of 743b0c5 to stage-aosp-master 
Change-Id: I17c32128b1c376927319183fa78eb60044a7d0b5
 2016-07-11 13:59:03 -07:00
Tim Murray
5dcff8f2b1 Add support for background stune group. 
bug 29512132

Change-Id: If8144bfee0fb30cf11f2bb26494ca5e83c11d4d7
 2016-07-11 13:57:31 -07:00
Elliott Hughes
743b0c5e35 Merge "Switch run-as to libpackagelistparser." 2016-07-11 20:53:11 +00:00
Tim Murray
b8a19f4499 Merge changes from topic \'stune\' into nyc-mr1-dev 
am: 4b75a86858

Change-Id: Ib11061d5d539f2e82ad16f122ea7d7b621bd988d
 2016-07-11 20:35:56 +00:00
Tim Murray
4b75a86858 Merge changes from topic 'stune' into nyc-mr1-dev 
* changes:
  Add support for top-app stune group.
  Set stune groups from set_sched_policy.
 2016-07-11 20:29:41 +00:00
Irina Patru
23ad7517d2 init.rc: Remove cpu weight set on the root cgroup 
It isn't allowed to change the cpu.share value for the root cgroup.
See kernel commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597

This fixes the following error seen in dmesg:
init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument

BUG: 28735908

Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af
Signed-off-by: Irina Patru <irina.patru@intel.com>
(cherry picked from commit c560c6310f)
 2016-07-11 12:35:51 -07:00
Tim Kryger
724dfbac70 Remove attempt to write sched_compat_yield 
The sched_compat_yield option was eliminated in Linux 2.6.38 by commit
ac53db596cc0 ("sched: Use a buddy to implement yield_task_fair()") and
as a result, the following error is printed to the log during boot up.

init: write_file: Unable to open '/proc/sys/kernel/sched_compat_yield':
No such file or directory"

Bug: 30034121
Change-Id: Idbdb68de0cb3ab1f67d82a4d66af880bcfdfe261
 2016-07-11 11:41:56 -07:00
Tim Murray
955694b657 Add support for top-app stune group. 
bug 29512132

Change-Id: I41ec2dd80a469309f48dbb59fc27fbe43fcd67b3
 2016-07-11 11:40:15 -07:00
Jorge Lucangeli Obes
67410f8578 Merge \\\"Refactor Service::Start method.\\\" am: 82d2bcc21e am: f2ffdac47a 
am: 77dbaad7b9

Change-Id: Ief7f4cc5b95b018d8476dd9a35cc76dd384fcbc5
 2016-07-11 17:21:18 +00:00
Jorge Lucangeli Obes
77dbaad7b9 Merge \\"Refactor Service::Start method.\\" am: 82d2bcc21e 
am: f2ffdac47a

Change-Id: Ib7818912dd753cf40c61146c26674102bdbed338
 2016-07-11 17:17:05 +00:00
Jorge Lucangeli Obes
f2ffdac47a Merge \"Refactor Service::Start method.\" 
am: 82d2bcc21e

Change-Id: Icccd918f1dc02010c9aceb4560dc5ff18849d8a5
 2016-07-11 17:13:26 +00:00
Treehugger Robot
82d2bcc21e Merge "Refactor Service::Start method." 2016-07-11 17:08:45 +00:00
Tim Murray
aa45cb85e3 Set stune groups from set_sched_policy. 
bug 29512132

Change-Id: Ib4176b80787db9e7ace9468cbf670f05cc428786
 2016-07-11 10:05:56 -07:00
Sergio Giro
78d173ed25 system/core: using equivalent code to fix build break for win host 
am: 1e61274532

Change-Id: Ic8ad29b579d5c4ae40c4f3c99a404014281fee81
 2016-07-11 15:58:29 +00:00
Sergio Giro
1e61274532 system/core: using equivalent code to fix build break for win host 
Error from x86_64-w64-mingw32-g++ was:
system/core/libutils/Unicode.cpp: In function ‘ssize_t utf16_to_utf8_length(const char16_t*, size_t)’:
system/core/libutils/Unicode.cpp:487:78: error: ‘std::basic_ostream<char>::__ostream_type’ has no member named ‘str’
     std::string logged_string = (std::ostringstream() << ret_difference).str();

Bug: 29250543

Test: make winsdk-tools, ran libutils_test, checked that safetynet logs appear using adb


Change-Id: I09fc1e3e0dcc4683bde987f9e23e3bb4bea8b367
 2016-07-11 15:37:38 +00:00
Jorge Lucangeli Obes
344d01f99f Refactor Service::Start method. 
This CL extracts code from Service::Start into four helper functions,
bringing Service::Start down to 134 lines vs 212 lines originally. This
makes the method a lot easier to follow. There is no change in behaviour.

Also, make error messages consistent (start with lowercase) and
format Service::Start to fit in 100 cols.

Bug: 30035168

Change-Id: If979976fba4d339a336d030f802ca9f169fd012c
 2016-07-11 09:57:17 -04:00
Sergio Giro
502602366c Merge \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into nyc-mr1-dev 
am: 7714abac6b

Change-Id: I63e0299219dc1e50b31a88384fed7f3f43e9f86e
 2016-07-11 12:22:43 +00:00
Sergio Giro
7714abac6b Merge "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" into nyc-mr1-dev 2016-07-11 12:11:32 +00:00
Sergio Giro
c4966a363e libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.

Correcting the length computation and adding bound checks to the
conversion functions.

Test: ran libutils_tests
Bug: 29250543
Change-Id: I6115e3357141ed245c63c6eb25fc0fd0a9a7a2bb
 2016-07-11 09:46:32 +00:00
Dan Willemsen
d377004c98 Merge \\\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\\" am: 5d420e791b am: bdd01e86a5 
am: a5b9b8f452

Change-Id: Iceb0c03fa05a7f6126428128c8e5dced5e7e6cef
 2016-07-09 06:08:40 +00:00
Dan Willemsen
a5b9b8f452 Merge \\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\" am: 5d420e791b 
am: bdd01e86a5

Change-Id: I6205590b79d8325edd5b15e4933a80b2d11238a1
 2016-07-09 06:05:52 +00:00
Dan Willemsen
bdd01e86a5 Merge \"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\" 
am: 5d420e791b

Change-Id: I3a65ccc6bc5d6b3c63484baaa6d816939bd48073
 2016-07-09 06:03:09 +00:00
Dan Willemsen
5d420e791b Merge "Use BOARD_USES_VENDORIMAGE to detect vendor image presence" 2016-07-09 05:57:55 +00:00
Erik Kline
48b1eec502 Add UIDs for system DNS and tethering DNS 
am: 3c2e2f4d5e

Change-Id: Ib954d5814acf71aa22463f7f3d055a82e6e30bb4
 2016-07-09 05:43:07 +00:00
Dan Willemsen
0790431f75 Use BOARD_USES_VENDORIMAGE to detect vendor image presence 
When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.

Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
 2016-07-08 18:17:48 -07:00