Commit Graph

23928 Commits

Author SHA1 Message Date
Elliott Hughes 0c8bf5798f Switch run-as to libpackagelistparser.
We already have to have a Java and a native implementation; we don't
need _two_ native implementations.

Change-Id: I0201205ce5079ef9c747abc37b0c8122cf8fb136
2016-07-07 16:50:32 -07:00
Mark Salyzyn 59cce987ec Merge \"logcat: help spelling correction\"
am: 20a172fca7

Change-Id: I2fd638e43b9d4f677d55a9c7b2e7c8eebfce5b0a
2016-07-06 21:46:29 +00:00
Treehugger Robot 20a172fca7 Merge "logcat: help spelling correction" 2016-07-06 21:36:07 +00:00
Mark Salyzyn e735a7305b logcat: help spelling correction
threadtime and added clarity for adverbs

Bug: 29916087
Change-Id: Idbed8bc74147c105eaced940d035d0649a244b18
2016-07-06 13:33:57 -07:00
Mark Salyzyn b13d0ce160 Merge \"logcat: format verbs and adverbs\"
am: 82fb012a03

Change-Id: I1f897abc493f63195fff505c37746ee9e82cfac1
2016-07-06 20:27:29 +00:00
Treehugger Robot 82fb012a03 Merge "logcat: format verbs and adverbs" 2016-07-06 20:18:00 +00:00
Mark Salyzyn ec129fe06c Merge \"libcutils: canned_fs_config.c drop tabs\"
am: 4ee9ed5366

Change-Id: Ie72d7562be3316d2ebe732dd1d1fbd4a04b6557b
2016-07-06 18:54:23 +00:00
Treehugger Robot 4ee9ed5366 Merge "libcutils: canned_fs_config.c drop tabs" 2016-07-06 18:50:22 +00:00
Mark Salyzyn 9cfd1c6ebc logcat: format verbs and adverbs
Bug: 29916087
Change-Id: I039c95b9dc0aa88f1219121513899934381453ae
2016-07-06 11:16:07 -07:00
Mark Salyzyn 768cbb0404 libcutils: canned_fs_config.c drop tabs
- replace tabs with spaces, get indent right
- Sort header order as per Android coding standard

Change-Id: I634f6f716a368ce5565ccc880c51406042f312bf
2016-07-06 10:45:11 -07:00
Erik Kline d63cf7d85a Add UIDs for system DNS and tethering DNS
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
2016-07-06 11:13:59 +09:00
Elliott Hughes 2f589bf974 Merge \"Fix the generated getevent labels.\"
am: 80beb506cf

Change-Id: I1e289081553afc516c96584822e36c3475675e98
2016-06-29 23:48:12 +00:00
Treehugger Robot 80beb506cf Merge "Fix the generated getevent labels." 2016-06-29 23:43:15 +00:00
Elliott Hughes 171a829c39 Make klog_fd thread-safe and make klog_init a no-op.
I'll come back and remove klog_init when I've removed other calls to it.

Change-Id: Iad7fd26d853b4ddc54e9abd44516b6f138cbbfcb
Test: booted N9, looked at "adb shell dmesg" output.
2016-06-29 16:16:41 -07:00
Jorge Lucangeli Obes 69e6dde7c6 Merge \"Rename \"Handle(r)\" to \"Parse(r)\" in Android init.\"
am: b0d062a497

Change-Id: If3b070c3ec8599e065980bec123bf8c2cf160222
2016-06-29 21:51:08 +00:00
Treehugger Robot b0d062a497 Merge "Rename "Handle(r)" to "Parse(r)" in Android init." 2016-06-29 21:46:02 +00:00
Elliott Hughes b22b9987a8 Fix the generated getevent labels.
Some of the less-used stuff stayed behind in input.h, so we need to
parse both files.

Change-Id: Iff2b6e3fc4f5a6584169d12f16427b4f235da21a
Test: manual inspection of the generated file.
2016-06-29 14:12:29 -07:00
Jorge Lucangeli Obes 177b27d4f5 Rename "Handle(r)" to "Parse(r)" in Android init.
The code in question parses config files, so use the right terminology.

Bug: 29872991
Change-Id: Id9644d9a98c1d702d2990f62b3020a27d073141e
2016-06-29 16:29:53 -04:00
Jorge Lucangeli Obes 5b951eebec Merge \"init: Add option to run a service in a new PID/mount namespace.\"
am: e71cedf450

Change-Id: I963b61c06922ae017fdb27b4a3a99d6519505329
2016-06-29 20:29:07 +00:00
Treehugger Robot e71cedf450 Merge "init: Add option to run a service in a new PID/mount namespace." 2016-06-29 20:20:16 +00:00
Jorge Lucangeli Obes 1b3fa3d650 init: Add option to run a service in a new PID/mount namespace.
Namespaces are a more consistent isolation primitive than e.g. hiding
/proc.

Bug: 29635190

Change-Id: I7c39975813fb13b3d06be35a24c0854f16549c0a
2016-06-29 14:49:11 -04:00
Elliott Hughes 7191a56e96 Merge \"Remove unnecessary ARRAY_SIZE macros.\"
am: c37d8ea22a

Change-Id: Id3443d7247e893ee549ae5b799a8f0bf42088d35
2016-06-29 00:16:44 +00:00
Treehugger Robot c37d8ea22a Merge "Remove unnecessary ARRAY_SIZE macros." 2016-06-29 00:12:25 +00:00
Elliott Hughes 6beba74a40 Merge \"Lose start/stop to toybox.\"
am: 76ef4e8ae2

Change-Id: I8aa3eaf68f7e35af8641ddbaed2a22d3909fa43b
2016-06-28 23:53:07 +00:00
Treehugger Robot 76ef4e8ae2 Merge "Lose start/stop to toybox." 2016-06-28 23:46:50 +00:00
Elliott Hughes 749ae2d32f Remove unnecessary ARRAY_SIZE macros.
Use the canonical one instead.

Change-Id: Id80f19455f37fd2a29d9ec4191c1a0af80c5c0e7
2016-06-28 14:48:45 -07:00
Elliott Hughes 694b2ec56e resolve merge conflicts of 54c1219 to stage-aosp-master
am: 7f5b29ff1e

Change-Id: I8774fc7a4ea5588f27bc65c016335ec88ff07f3a
2016-06-27 17:02:24 +00:00
Elliott Hughes 7f5b29ff1e resolve merge conflicts of 54c1219 to stage-aosp-master
Change-Id: I4b3b2a8690cfe147929fd096de380a9d4b79f1ec
2016-06-27 09:54:25 -07:00
Treehugger Robot 54c121962b Merge "Move init to libbase logging." 2016-06-27 16:17:17 +00:00
Elliott Hughes f86b5a6b90 Move init to libbase logging.
Change-Id: Ibfbefeff587a69e948978a037c555fd12a5ade6a
2016-06-27 08:11:31 -07:00
Elliott Hughes 77b189acd9 Merge \\"Remove MTD cruft from init.\\" am: 90db709a2f
am: 80744d867f

Change-Id: Ibc71442293b520a0c351d318d4bcc3bb3bce963c
2016-06-25 02:27:39 +00:00
Elliott Hughes 80744d867f Merge \"Remove MTD cruft from init.\"
am: 90db709a2f

Change-Id: I027708dd324000cbfad1a2a6e970f742db97bae5
2016-06-25 02:25:38 +00:00
Treehugger Robot 90db709a2f Merge "Remove MTD cruft from init." 2016-06-25 02:20:39 +00:00
Elliott Hughes 3195116e97 Remove MTD cruft from init.
Bug: http://b/29250988
Change-Id: I38ab263192944e4ff291fd91b25db163a8848d75
2016-06-24 18:26:30 -07:00
Elliott Hughes 50f39ddb49 Lose start/stop to toybox.
Change-Id: Ifd918a40616ec55fd3e782423fba67e0183bb8f3
2016-06-24 15:02:03 -07:00
Elliott Hughes c3f9902cee Merge \\"Remove more obsolete MTD stuff.\\" am: aa9f37185f
am: e9a7f52ce5

Change-Id: Ib764c2c71622696d0551c16e74dadc9180667d2e
2016-06-24 17:36:57 +00:00
Elliott Hughes e9a7f52ce5 Merge \"Remove more obsolete MTD stuff.\"
am: aa9f37185f

Change-Id: I7952147c2115d1e205737277376726507aed8447
2016-06-24 17:31:59 +00:00
Treehugger Robot aa9f37185f Merge "Remove more obsolete MTD stuff." 2016-06-24 17:19:48 +00:00
Elliott Hughes 01e5a6c971 Remove more obsolete MTD stuff.
Bug: http://b/29250988
Change-Id: Ic2d0514fcdbe26526e87bc681b71efcc90eda678
Test: still builds.
2016-06-24 09:13:51 -07:00
Hung-ying Tyan 2acf4a81dc resolve merge conflicts of 66277db to stage-aosp-master
am: 23a574a195

Change-Id: Id3e18ffa3a9e40755bd65bfbab79f79a7f8373a0
2016-06-24 06:10:09 +00:00
Hung-ying Tyan 23a574a195 resolve merge conflicts of 66277db to stage-aosp-master
Change-Id: I58b1f7fec779c707ac4048ae5401087ec4b7c8b0
2016-06-24 13:21:09 +08:00
Hung-ying Tyan 66277db8d0 Merge "Add -f to insmod" 2016-06-24 04:34:56 +00:00
Daniel Micay 729722b3ea Merge \\\\\"add a property for controlling perf_event_paranoid\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc
am: 34ae543dc3

Change-Id: I15e967dd17a52ea6dbc6d23e4d37ee95ff242e51
2016-06-24 03:44:02 +00:00
Jeffrey Vander Stoep 34ae543dc3 Merge \\\\"add a property for controlling perf_event_paranoid\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38
am: 2d48c395cc

Change-Id: I678c109987a60bfc97b44ef4a48a4d658283ca66
2016-06-24 03:41:19 +00:00
Hung-ying Tyan bfa6d75c60 Add -f to insmod
When the flag is on, insmod will bypass vermagic and symbol version
checking in the kernel. This is to make it possible to update kernel
without recompiling kernel modules.

BUG=28803994

Change-Id: Ib4be6999ef52baefd4210ee0d242360e43318907
2016-06-24 11:10:46 +08:00
Josh Gao 36e606236a Merge \\"adb: refactor jdwp_service.cpp.\\" am: 71d11ade9d
am: a4e35be4a4

Change-Id: I7bbc7c8b3df8cd2aa37bd41dfb53fda8b841cbb9
2016-06-23 23:34:09 +00:00
Josh Gao a4e35be4a4 Merge \"adb: refactor jdwp_service.cpp.\"
am: 71d11ade9d

Change-Id: If7940e3a0b3a457d9be29dfb6c0707dbe8961397
2016-06-23 23:31:38 +00:00
Treehugger Robot 71d11ade9d Merge "adb: refactor jdwp_service.cpp." 2016-06-23 23:28:25 +00:00
Josh Gao c0c57c43b2 Merge \\"adb: add test for SIGHUP behavior.\\" am: a355dd6110
am: 05f889dd4e

Change-Id: I7ea1f3071fbf0f8a5dd83173c62566e08b3c2503
2016-06-23 23:14:39 +00:00
Josh Gao 05f889dd4e Merge \"adb: add test for SIGHUP behavior.\"
am: a355dd6110

Change-Id: Ib786fefd55a2a4533bf66dc1e47f88e398beb8e1
2016-06-23 23:12:05 +00:00