Josh Gao
cba3b1888e
Merge "adb: fix mkdirs test."
...
am: 1a34944cde
* commit '1a34944cde5c8241bb74cde992d09f9115d5b53a':
adb: fix mkdirs test.
2016-02-09 01:10:04 +00:00
Yabin Cui
c02853bd14
Merge "libziparchive: port unit tests to darwin and windows."
...
am: b958d22310
* commit 'b958d223107799a8f4d0100a634704f54794d551':
libziparchive: port unit tests to darwin and windows.
2016-02-09 01:05:24 +00:00
Josh Gao
1a34944cde
Merge "adb: fix mkdirs test."
2016-02-09 01:02:22 +00:00
Yabin Cui
b958d22310
Merge "libziparchive: port unit tests to darwin and windows."
2016-02-09 00:56:43 +00:00
Yabin Cui
8e6f722764
libziparchive: port unit tests to darwin and windows.
...
Also use ReadFully to replace read, because read can
return reading bytes less than requested. And use
WriteFully to replace write.
Bug: 26962895
Change-Id: Iff0b2bc6d925619a537f7fef682c2a7ad89a2dc2
2016-02-08 16:52:55 -08:00
Dan Willemsen
cf1381c834
Merge "Fix windows 64-bit builds"
...
am: 3f68ba4dc6
* commit '3f68ba4dc67360d4c242110005e36bfe65c66098':
Fix windows 64-bit builds
2016-02-08 23:59:59 +00:00
Dan Willemsen
3f68ba4dc6
Merge "Fix windows 64-bit builds"
2016-02-08 23:40:48 +00:00
Josh Gao
1172b2ec71
adb: fix mkdirs test.
...
The behavior of mkdirs was changed a while ago, without updating the
test.
Change-Id: I2aaa73818933b281e911c42a14e3c843d8bd972a
2016-02-08 11:22:50 -08:00
David Pursell
09bd9593f0
Merge "fastboot: add Socket timeout detection."
...
am: d4ac11a57d
* commit 'd4ac11a57d37c56360e59ba75aa2f6ee777e5ed8':
fastboot: add Socket timeout detection.
2016-02-08 19:00:39 +00:00
David Pursell
d4ac11a57d
Merge "fastboot: add Socket timeout detection."
2016-02-08 16:13:39 +00:00
Jeff Sharkey
23419e3926
Merge "Follow migration of Shell app to DE storage."
2016-02-07 03:57:31 +00:00
Jeff Sharkey
c457610e78
Follow migration of Shell app to DE storage.
...
The Shell app that stores bugreports now lives under DE storage for
all devices, both FBE and non-FBE.
Bug: 26668510
Change-Id: Iead1dcb98181a5caccf4d0c1e86de62abc6dc990
2016-02-06 20:15:24 -07:00
Christopher Ferris
b3625f50b2
Merge "Fix use of uninitialized memory." am: 45c8586dad
...
am: 50443ed1ad
* commit '50443ed1ad7a0765030eefb557f9252a46e274db':
Fix use of uninitialized memory.
2016-02-06 03:51:50 +00:00
Christopher Ferris
50443ed1ad
Merge "Fix use of uninitialized memory."
...
am: 45c8586dad
* commit '45c8586dad4796fa227b60745ba2d0dbae44b062':
Fix use of uninitialized memory.
2016-02-06 03:49:36 +00:00
Christopher Ferris
45c8586dad
Merge "Fix use of uninitialized memory."
2016-02-06 03:46:28 +00:00
Dan Willemsen
86cf941c48
Fix windows 64-bit builds
...
pid_t is 64-bit in 64-bit mingw, but the windows process/thread
functions return a DWORD(uint32_t). Instead of promoting to a pid_t and
fixing the format strings, just use a uint32_t to store the values.
android_thread_id also cannot be a 64-bit pointer, so for windows just
force it to be a uint32_t.
libutils/ProcessCallStack only works under Linux, since it makes heavy
use of /proc. Don't compile it under Windows or Darwin.
Bug: 26957718
Change-Id: I4e43e7cf18a96f22b3a9a08dbab8c3e960c12930
2016-02-05 16:10:10 -08:00
Christopher Ferris
d4c884330c
Fix use of uninitialized memory.
...
When creating an UnwindMapLocal fails in the Build() function call,
the destructor for UnwindMap is called. Unfortunately, the map_cursor_
member variable has not been initialized, so the call to destroy it
winds up operating on garbage data.
Part of this is a result of a bad class hierarchy, so this refactors
the classes slightly, and properly initializes the map_cursor_ member
variable in the base class.
Bug: 26931578
Change-Id: I885596bf65e4ef63559cee2c56cd41576d5ecc1b
2016-02-05 15:22:34 -08:00
David Pursell
c742a7f174
fastboot: add Socket timeout detection.
...
UDP fastboot will require re-transmission in the case of datagrams
getting lost. This CL adds Socket functionality to easily distinguish
between a normal timeout and a socket failure.
I also found some Windows docs that indicate sockets may become
invalid after a call to recv() times out. This has never occurred in
my testing, but to be safe this switches the timeout implementation
to use select() instead of SO_RCVTIMEO.
Bug: http://b/26154914
Change-Id: Id7b598f8aea5df1a3676d24702b489042d5f9e3a
2016-02-05 13:22:06 -08:00
Jeff Sharkey
c895f11cf1
Merge "User 0 directories are created by vold now."
2016-02-05 21:01:21 +00:00
Elliott Hughes
be49484810
Merge "init: fix writepid wrong pid written in file(s)" am: 718625010d
...
am: 880200c9bb
* commit '880200c9bbf8b283b0f6351c1c052bc00d69697d':
init: fix writepid wrong pid written in file(s)
2016-02-05 19:06:37 +00:00
Elliott Hughes
880200c9bb
Merge "init: fix writepid wrong pid written in file(s)"
...
am: 718625010d
* commit '718625010d839481cdef5f0305f2622a0aa87cd8':
init: fix writepid wrong pid written in file(s)
2016-02-05 18:47:15 +00:00
Elliott Hughes
718625010d
Merge "init: fix writepid wrong pid written in file(s)"
2016-02-05 18:41:52 +00:00
Elliott Hughes
8738be09e0
Merge "Fix libbase\'s logging dependency." am: ead369bdf0
...
am: 068e7f7d15
* commit '068e7f7d1591ae163777cec8d1404b77d92c2fd6':
Fix libbase's logging dependency.
2016-02-05 18:32:34 +00:00
Elliott Hughes
068e7f7d15
Merge "Fix libbase\'s logging dependency."
...
am: ead369bdf0
* commit 'ead369bdf03e7b0f065dcf115f609e41c634429a':
Fix libbase's logging dependency.
2016-02-05 18:30:32 +00:00
Elliott Hughes
ead369bdf0
Merge "Fix libbase's logging dependency."
2016-02-05 18:25:43 +00:00
Mark Salyzyn
c47812a94f
Merge "libcutils: abort for invalid fd" am: 76f99770d1
...
am: 8a0e1c51bd
* commit '8a0e1c51bdf42bcb3f1840173c27b097d106cd60':
libcutils: abort for invalid fd
2016-02-05 18:15:14 +00:00
Mark Salyzyn
8a0e1c51bd
Merge "libcutils: abort for invalid fd"
...
am: 76f99770d1
* commit '76f99770d12aedab21a9c2ecee82e5874db50bd1':
libcutils: abort for invalid fd
2016-02-05 18:12:07 +00:00
Mark Salyzyn
76f99770d1
Merge "libcutils: abort for invalid fd"
2016-02-05 18:05:24 +00:00
Mark Salyzyn
a2eba56f98
Merge "init-debug.rc: add runtime mmc max speed property actors" am: 20a6f0ff3b
...
am: c883cdec82
* commit 'c883cdec825e021007672d3ce9b199589ed2cba6':
init-debug.rc: add runtime mmc max speed property actors
2016-02-05 17:38:44 +00:00
Mark Salyzyn
c883cdec82
Merge "init-debug.rc: add runtime mmc max speed property actors"
...
am: 20a6f0ff3b
* commit '20a6f0ff3bf21e2bc82ebfe06357f6225c991ee9':
init-debug.rc: add runtime mmc max speed property actors
2016-02-05 15:25:14 +00:00
Mark Salyzyn
20a6f0ff3b
Merge "init-debug.rc: add runtime mmc max speed property actors"
2016-02-05 15:21:35 +00:00
Anestis Bechtsoudis
b702b46f68
init: fix writepid wrong pid written in file(s)
...
When child (pid==0) executes fork branch 'pid_str'
will always be 0 writting wrong value to file(s).
Fix by utilizing getpid() to obtain correct pid.
Tracker link provides some insight on why use cases
aren't broken.
Bug: https://code.google.com/p/android/issues/detail?id=200392
Change-Id: I29989365a8bac94502c090918fa30e5cc88eb1ea
Signed-off-by: Anestis Bechtsoudis <anestis@census-labs.com>
2016-02-05 16:49:28 +02:00
Christopher Ferris
4029aec8af
Merge "Newer kernels added SEGV_BNDERR." am: 14c06e0769
...
am: 840887053c
* commit '840887053cee03190cbcff42a9629999052828fe':
Newer kernels added SEGV_BNDERR.
2016-02-05 02:22:25 +00:00
Christopher Ferris
840887053c
Merge "Newer kernels added SEGV_BNDERR."
...
am: 14c06e0769
* commit '14c06e0769817d81f18fcdc41132747ffc158745':
Newer kernels added SEGV_BNDERR.
2016-02-05 02:20:13 +00:00
Christopher Ferris
14c06e0769
Merge "Newer kernels added SEGV_BNDERR."
2016-02-05 02:08:27 +00:00
Chih-hung Hsieh
e9163e7f39
Merge "Suppress false positive memory leak warnings." am: cfd44ee74f
...
am: 22ac670f67
* commit '22ac670f6793f743501c72b7b5bcacc015235652':
Suppress false positive memory leak warnings.
2016-02-05 01:29:13 +00:00
Chih-hung Hsieh
22ac670f67
Merge "Suppress false positive memory leak warnings."
...
am: cfd44ee74f
* commit 'cfd44ee74f2318565d188ee0b2dd08911519d55e':
Suppress false positive memory leak warnings.
2016-02-05 01:26:52 +00:00
Chih-hung Hsieh
cfd44ee74f
Merge "Suppress false positive memory leak warnings."
2016-02-05 01:21:14 +00:00
Chih-Hung Hsieh
f7e7bd4c3b
Suppress false positive memory leak warnings.
...
Clang static analyzer does not know the transfer of
object ownership to hashmapPut. Use a fake global
pointer variable to trick the analyzer.
BUG: 26955438
Change-Id: Id3ac595fff14e48d28a1147461cd836914857086
2016-02-04 16:38:04 -08:00
Alex Deymo
52e87a6431
Merge "metricsd: Create a brillo::MessageLoop." am: 205cdb8868
...
am: 9a5588e0cb
* commit '9a5588e0cb56471cd034fd924281cb0ba508db7e':
metricsd: Create a brillo::MessageLoop.
2016-02-04 23:57:59 +00:00
Alex Deymo
9a5588e0cb
Merge "metricsd: Create a brillo::MessageLoop."
...
am: 205cdb8868
* commit '205cdb88680ce65382e2fa7080b6a6b603146c96':
metricsd: Create a brillo::MessageLoop.
2016-02-04 23:43:17 +00:00
Alex Deymo
205cdb8868
Merge "metricsd: Create a brillo::MessageLoop."
2016-02-04 23:38:54 +00:00
Jorge Lucangeli Obes
ce67d85339
Merge "Unit tests: Compile only on \'eng\' builds." am: 42a53e0c2a
...
am: 0995795e1f
* commit '0995795e1f257eca86266ed656fe57a634bc0694':
Unit tests: Compile only on 'eng' builds.
2016-02-04 22:31:40 +00:00
Jorge Lucangeli Obes
0995795e1f
Merge "Unit tests: Compile only on \'eng\' builds."
...
am: 42a53e0c2a
* commit '42a53e0c2a46ae8ef44849c8bfb023abd00fd1b7':
Unit tests: Compile only on 'eng' builds.
2016-02-04 22:29:43 +00:00
Jeff Sharkey
3b9c83a0f6
User 0 directories are created by vold now.
...
This ensures that all users on device follow a consistent path for
setup and validation of encryption policy.
Also add remaining user-specific directories and fix linking order.
Bug: 25796509
Change-Id: I8c2e42a78569817f7f5ea03f54b743a6661fdb9c
2016-02-04 15:26:23 -07:00
Jorge Lucangeli Obes
42a53e0c2a
Merge "Unit tests: Compile only on 'eng' builds."
2016-02-04 22:24:46 +00:00
Jorge Lucangeli Obes
1e7592c9d5
Unit tests: Compile only on 'eng' builds.
...
metrics_collector_tests, metricsd_tests.
Bug: 26967770
Change-Id: I6d7e8fb6d3d98ab747d922bfeef05aa344b2179c
2016-02-04 14:17:46 -08:00
Jorge Lucangeli Obes
2c98e128c5
Merge "crash_reporter_tests: Compile only on \'eng\' builds." am: a7d277796f
...
am: f3cf9b465e
* commit 'f3cf9b465e4720573f631d0257c2ee4e57991093':
crash_reporter_tests: Compile only on 'eng' builds.
2016-02-04 22:11:28 +00:00
Jorge Lucangeli Obes
f3cf9b465e
Merge "crash_reporter_tests: Compile only on \'eng\' builds."
...
am: a7d277796f
* commit 'a7d277796f3d04d751e54e6e2ecd17ee023f295b':
crash_reporter_tests: Compile only on 'eng' builds.
2016-02-04 22:07:48 +00:00
Christopher Ferris
5d56e28537
Newer kernels added SEGV_BNDERR.
...
Bug: 23789423
Change-Id: I6fdce75715edfce179df8c0e6a7205f26341ebd0
2016-02-04 14:07:23 -08:00