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

24078 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Daniel Rosenberg
479c280e58 Merge "resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-07-08 18:24:26 +00:00
Elliott Hughes
6605b0b23a Merge \\\"Make klog_fd thread-safe and make klog_init a no-op.\\\" am: 588b770063 am: 73d363bbc1 
am: 7288ac3982

Change-Id: I46bbcb64eecc01ec7bd8bb502237c1b9057befc4
 2016-07-08 17:12:48 +00:00
Elliott Hughes
7288ac3982 Merge \\"Make klog_fd thread-safe and make klog_init a no-op.\\" am: 588b770063 
am: 73d363bbc1

Change-Id: I48fcc144efb7e6e4de4620bfa5815123247c94d6
 2016-07-08 17:09:08 +00:00
Elliott Hughes
73d363bbc1 Merge \"Make klog_fd thread-safe and make klog_init a no-op.\" 
am: 588b770063

Change-Id: I884276a8f8b8209f6e956c5fb410e8265184e1b5
 2016-07-08 17:05:25 +00:00
Elliott Hughes
588b770063 Merge "Make klog_fd thread-safe and make klog_init a no-op." 2016-07-08 17:01:13 +00:00
Erik Kline
5f7ecd953a Merge \\\"Add UIDs for system DNS and tethering DNS\\\" am: c4dc4f3fc2 am: fcf3ed51dc 
am: 9f31416013

Change-Id: I2ad186412133603a36d91801737d15d4441d4956
 2016-07-08 08:55:14 +00:00
Erik Kline
9f31416013 Merge \\"Add UIDs for system DNS and tethering DNS\\" am: c4dc4f3fc2 
am: fcf3ed51dc

Change-Id: Icaeffaa67c3cc5c2452843b92577dd7bdab01146
 2016-07-08 08:51:43 +00:00
Erik Kline
3c2e2f4d5e Add UIDs for system DNS and tethering DNS 
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
(cherry picked from commit d63cf7d85a)
 2016-07-08 17:49:40 +09:00
Erik Kline
fcf3ed51dc Merge \"Add UIDs for system DNS and tethering DNS\" 
am: c4dc4f3fc2

Change-Id: I40d246a3d4c293797ae5204cebd61b50c4021205
 2016-07-08 08:48:11 +00:00
Treehugger Robot
c4dc4f3fc2 Merge "Add UIDs for system DNS and tethering DNS" 2016-07-08 08:43:55 +00:00
Daniel Rosenberg
906c5574b3 resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp 
Change-Id: I64433da7565ad15edb9c572558c4495eeacbf5c7
 2016-07-07 19:40:21 -07:00
TreeHugger Robot
786f5def5b Merge "Switch fastboot to new A/B spec" into nyc-mr1-dev 2016-07-08 00:20:46 +00:00
Daniel Rosenberg
563fcf6f69 Switch fastboot to new A/B spec 
Slots are now referred to as a and b instead
of _a and _b. For the moment, _a and _b will
still be supported. For old devices that
support A/B, they are assumed to have 2 slots.

Bug: 29643845
Change-Id: Ieab6bed7b4977d8386dcec0afa434371f54bd63f
 2016-07-07 15:36:43 -07:00
Tim Murray
6469fa2a7e resolve merge conflicts of 3a29e34 to nyc-mr1-dev-plus-aosp 
Change-Id: I4edd53094a98fcb3cd3e1b063122d13f80d36d3c
 2016-07-07 13:40:18 -07:00
Tim Murray
3a29e344b0 Update FIFO settings for new uses of FIFO. 
Adjust FIFO timings as well as allow SurfaceFlinger to use FIFO.

bug 24503801

Change-Id: I2c21d4c1788777c2d0d77227bb872701b35c4ff6
 2016-07-07 11:35:41 -07:00
Mark Salyzyn
aa32e374c0 Merge \\\"logcat: help spelling correction\\\" am: 20a172fca7 am: 59cce987ec 
am: 4c04c98a31

Change-Id: I8475be8a4495969aa66826791c9966d7b407f78c
 2016-07-06 21:55:15 +00:00
Mark Salyzyn
4c04c98a31 Merge \\"logcat: help spelling correction\\" am: 20a172fca7 
am: 59cce987ec

Change-Id: I5d1019e7b25601b8ad22b8a2fd728ee64ffd081f
 2016-07-06 21:49:12 +00: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
6a70a53235 Merge \\\"logcat: format verbs and adverbs\\\" am: 82fb012a03 am: b13d0ce160 
am: b6dbe28746

Change-Id: I277fbcebeeffd237adf63831be715eabfaf8d758
 2016-07-06 20:36:27 +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
b6dbe28746 Merge \\"logcat: format verbs and adverbs\\" am: 82fb012a03 
am: b13d0ce160

Change-Id: I2b6d0772a5e3db4b539db0c4facca583cabe92c1
 2016-07-06 20:32:07 +00: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
8e958c7aae Merge \\\"libcutils: canned_fs_config.c drop tabs\\\" am: 4ee9ed5366 am: ec129fe06c 
am: a8dbadd54e

Change-Id: If505b2655e6dbdf863f227ad03838aca66ebd1f6
 2016-07-06 18:59:04 +00:00
Mark Salyzyn
a8dbadd54e Merge \\"libcutils: canned_fs_config.c drop tabs\\" am: 4ee9ed5366 
am: ec129fe06c

Change-Id: I365d06333de78629f36fb94adf035f70a299e291
 2016-07-06 18:56:34 +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
Dan Stoza
5d636e830f NativeWindow: Add LAST_[DE]QUEUE_DURATION queries 
am: 94ededa387

Change-Id: I4fb6c849cf97dcd70cc7b7345e230238870e7d3a
 2016-07-06 16:27:37 +00: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
Dan Stoza
94ededa387 NativeWindow: Add LAST_[DE]QUEUE_DURATION queries 
Adds two new enums to enable querying the duration of the last
dequeue or queue operations to a Surface/ANativeWindow.

Bug: 29413700
Change-Id: Ifa16755911c4a3c013a7128dd4038d328109c32d
 2016-07-01 16:07:00 -07:00
Daniel Rosenberg
5dbec684ed Merge \"Fix missing newline in Fastboot help.\" into nyc-mr1-dev 
am: 7f871b4249

Change-Id: Ie6f6f96097bb26d3ed79e24a165131e77aa5752f
 2016-07-01 04:13:50 +00:00