Dan Albert
9616e82988
Merge "Support base::logging on Windows."
2015-04-30 01:02:31 +00:00
Dan Albert
5c19040b06
Support base::logging on Windows.
...
libc++ doesn't support std::mutex and friends for Windows yet, so we
just use a compatibility wrapper for now.
Change-Id: I2413d4c089e7d0fb232444043c6b772153035dab
2015-04-29 18:01:53 -07:00
Dan Albert
8076616c66
Merge "Fix gettid() on Windows."
2015-04-30 00:56:09 +00:00
Dan Albert
abdf69877b
Merge "Get libbase tests working on Windows."
2015-04-30 00:51:35 +00:00
Dan Albert
d23e95eed0
am c9e38959
: Merge "Print strerror instead of errno in tests."
...
* commit 'c9e38959cd6c05fabe1b3686ab09931e885e96cb':
Print strerror instead of errno in tests.
2015-04-30 00:40:28 +00:00
Dan Albert
c9e38959cd
Merge "Print strerror instead of errno in tests."
2015-04-30 00:29:51 +00:00
Dan Albert
b3a36ca5ee
Fix gettid() on Windows.
...
Accidentally had this all hidden by an #ifndef _WIN32 when I wrote it.
Change-Id: I3a6afefe23b799ea7aa0f9a380f5a743673096d0
2015-04-29 17:13:32 -07:00
Dan Albert
0c4b3a319d
Get libbase tests working on Windows.
...
Tests using files from /proc still fail on Windows (obviously), but
all tests are passing when run in Wine.
Change-Id: Ie4c3ba65b642202f8fcaec73332a53bee6115fba
2015-04-29 17:11:28 -07:00
Dan Albert
850188fc04
Print strerror instead of errno in tests.
...
Change-Id: Ibfab1b7cd439fdb5ae19855cc700613c00d4aff8
2015-04-29 17:10:49 -07:00
Elliott Hughes
0c799f6820
am ffa0d24d
: Merge "Fix Win32 build."
...
* commit 'ffa0d24d09f22d81b8e47f7a27a7aec5f421a023':
Fix Win32 build.
2015-04-29 19:49:41 +00:00
Elliott Hughes
ffa0d24d09
Merge "Fix Win32 build."
2015-04-29 19:36:33 +00:00
Elliott Hughes
1b600a902c
Fix Win32 build.
...
Change-Id: Icf2c8df99b4b88bbf85a4097731733c5795fba44
2015-04-29 12:36:06 -07:00
Elliott Hughes
6184d1f739
am 4546520c
: Merge "Move __adb_error to std::string, and improve various errors."
...
* commit '4546520c81c8ff02469678dfc235614bf31324c1':
Move __adb_error to std::string, and improve various errors.
2015-04-29 18:35:35 +00:00
Elliott Hughes
4546520c81
Merge "Move __adb_error to std::string, and improve various errors."
2015-04-29 18:32:53 +00:00
Elliott Hughes
078f0fcf4c
Move __adb_error to std::string, and improve various errors.
...
Also remove an sprintf. Also fix various bits of code that were
reporting stale adb_error values when they meant strerror.
Bug: http://b/20666660
Change-Id: Ibeb48b7bc21bb0ec30ba47889d1d671ee480e1b7
2015-04-29 11:28:37 -07:00
Dan Stoza
4e3dc2df5f
am 5d67a2c9
: Merge "ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query"
...
* commit '5d67a2c9c2de8a61f48fb873b86eb4b7c207a880':
ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query
2015-04-29 17:30:51 +00:00
Dan Stoza
5d67a2c9c2
Merge "ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query"
2015-04-29 17:21:57 +00:00
Paul Lawrence
2fe6a631c6
am 5feefcbe
: Merge "Securely encrypt the master key"
...
* commit '5feefcbedef5a60e385883c8a841c016dc0d0959':
Securely encrypt the master key
2015-04-29 16:36:52 +00:00
Paul Lawrence
5feefcbede
Merge "Securely encrypt the master key"
2015-04-29 16:25:14 +00:00
Narayan Kamath
ccb8abf5de
am 63177cbf
: Merge "Use base::WriteFully in zip_archive."
...
* commit '63177cbf7cd1787bf4c5f0ba4a824d1a13e6eeb3':
Use base::WriteFully in zip_archive.
2015-04-29 14:57:19 +00:00
Narayan Kamath
63177cbf7c
Merge "Use base::WriteFully in zip_archive."
2015-04-29 14:44:04 +00:00
Narayan Kamath
e97e66ea7c
Use base::WriteFully in zip_archive.
...
We're already linking against libbase but we'll have to add
a libbase dependency to every target that includes libziparchive
as a STATIC_LIBRARY dependency, given that there's no way to
express that what we want (except by adding a LOCAL_WHOLE_STATIC_LIBRARY
dependency on libbase to libziparchive but that seems bad too)
Change-Id: I294ad389a9c61a1134a7bc323da25b0004a8f1e0
2015-04-29 14:31:45 +00:00
Jeff Brown
387331c2ac
am 07e07aa4
: Merge "Add float support to binary event log."
...
* commit '07e07aa475ba6bd53e63fe5cc4658a3809dc6f5c':
Add float support to binary event log.
2015-04-29 01:55:16 +00:00
Jeff Brown
07e07aa475
Merge "Add float support to binary event log."
2015-04-29 01:42:47 +00:00
Jeff Brown
44193d9eae
Add float support to binary event log.
...
Bug: 20664753
Change-Id: Ib4752bd785496dab5bb4d4979d5d80f662adbdfa
2015-04-28 18:20:48 -07:00
Paul Lawrence
806d10be23
Securely encrypt the master key
...
Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.
Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.
This is one of four changes to enable this functionality:
https://android-review.googlesource.com/#/c/148586/
https://android-review.googlesource.com/#/c/148604/
https://android-review.googlesource.com/#/c/148606/
https://android-review.googlesource.com/#/c/148607/
Bug: 18151196
Change-Id: I6a8a18f43ae837e330e2785bd26c2c306ae1816b
2015-04-28 15:34:10 -07:00
Nick Kralevich
3ef42dd20f
am f0d24737
: Merge "init: remove support for disabled SELinux"
...
* commit 'f0d24737354819738adc40bf47a006e56652d27a':
init: remove support for disabled SELinux
2015-04-28 20:25:00 +00:00
Nick Kralevich
f0d2473735
Merge "init: remove support for disabled SELinux"
2015-04-28 20:13:56 +00:00
Nick Kralevich
d34e407aeb
init: remove support for disabled SELinux
...
Remove support for androidboot.selinux=disabled. Running with SELinux
disabled is not a supported configuration anymore. SELinux must be
in enforcing in shipping devices, but we also support permissive for
userdebug/eng builds.
Don't try security_setenforce() if we're already in enforcing mode.
A kernel compiled without CONFIG_SECURITY_SELINUX_DEVELOP does
not have a permissive mode, so the kernel will already be enforcing
once the policy is loaded.
Bug: 19702273
Change-Id: I07525a017ddb682020ec0d42e56a2702c053bdeb
2015-04-28 13:11:07 -07:00
Paul Lawrence
6a5244bcc2
am 2b3a4939
: Merge "Revert "Securely encrypt the master key""
...
* commit '2b3a4939463cb2eb6b65e416f6544a2e2d3bc29b':
Revert "Securely encrypt the master key"
2015-04-28 19:29:25 +00:00
Paul Lawrence
2306880f07
am 6e8c8f54
: Merge "Revert "Only run vold command when file encryption enabled""
...
* commit '6e8c8f542d673f3402df6b70df64b29c759e526a':
Revert "Only run vold command when file encryption enabled"
2015-04-28 19:17:20 +00:00
Paul Lawrence
2b3a493946
Merge "Revert "Securely encrypt the master key""
2015-04-28 19:15:40 +00:00
Paul Lawrence
7ac2807546
Revert "Securely encrypt the master key"
...
This reverts commit 4bf1887c78
.
Change-Id: Ie6d1f39de530b99b50a27ddc45bcc900a24e04b5
2015-04-28 19:15:01 +00:00
Paul Lawrence
6e8c8f542d
Merge "Revert "Only run vold command when file encryption enabled""
2015-04-28 19:14:45 +00:00
Paul Lawrence
34276a1534
Revert "Only run vold command when file encryption enabled"
...
This reverts commit efe190e023
.
Change-Id: Ib15af9a85b0b885a388bda28511a6fc39a777264
2015-04-28 19:12:35 +00:00
Than McIntosh
d6544d2a40
Invoke perfprofd daemon (only for userdebug/eng builds).
...
Change-Id: Ifaabe32dda6db249efc62c5db3760e32295eb1a9
2015-04-28 14:32:35 -04:00
Elliott Hughes
d797763ca6
am 4b81659e
: Merge "Remove strtok from adb."
...
* commit '4b81659ed2c0dd71c123301238c35b1e825e5b7a':
Remove strtok from adb.
2015-04-28 18:08:50 +00:00
Elliott Hughes
4b81659ed2
Merge "Remove strtok from adb."
2015-04-28 17:54:36 +00:00
Paul Lawrence
2088427c8c
am a71ef0d5
: Merge "Only run vold command when file encryption enabled"
...
* commit 'a71ef0d5b5c0e304d947f3782603890294d06ee2':
Only run vold command when file encryption enabled
2015-04-28 15:33:10 +00:00
Paul Lawrence
a71ef0d5b5
Merge "Only run vold command when file encryption enabled"
2015-04-28 15:24:10 +00:00
Elliott Hughes
8d5fa6da44
Remove strtok from adb.
...
Also fix android::base::Split to behave like Java, Python, and google3.
Change-Id: Ifbffd4e92950a79e7aea5d153c95fe0980648417
2015-04-27 19:42:20 -07:00
Elliott Hughes
3c93c69205
am 06d2128f
: Merge "Support the full length of USB serial numbers."
...
* commit '06d2128f8729f3349f5ba588829c6f992a793c22':
Support the full length of USB serial numbers.
2015-04-28 00:28:49 +00:00
Elliott Hughes
06d2128f87
Merge "Support the full length of USB serial numbers."
2015-04-28 00:18:29 +00:00
Elliott Hughes
9309ecbcec
Support the full length of USB serial numbers.
...
Two bugs: we couldn't report the serial number correctly if it was long
enough, and it wasn't possible to connect to a device whose serial number
was long enough to overflow a different fixed-length buffer.
Bug: http://b/20317730
Change-Id: Ic9cf3c847066449ac78069bd1718184935098ac7
2015-04-27 14:52:17 -07:00
Paul Lawrence
72fad66f0a
am 9234b169
: Merge "Securely encrypt the master key"
...
* commit '9234b169e62b10e38ecd3dc636ccccb425ea4eed':
Securely encrypt the master key
2015-04-27 20:25:16 +00:00
Paul Lawrence
9234b169e6
Merge "Securely encrypt the master key"
2015-04-27 20:08:53 +00:00
Elliott Hughes
55d3eb0afd
am 96b6415c
: Merge "Use WriteFully in debuggerd to talk to ActivityManager."
...
* commit '96b6415c560fc59e7114fd6f455943765947eeb7':
Use WriteFully in debuggerd to talk to ActivityManager.
2015-04-27 20:00:45 +00:00
Elliott Hughes
96b6415c56
Merge "Use WriteFully in debuggerd to talk to ActivityManager."
2015-04-27 19:47:30 +00:00
Greg Hackmann
64c1ec114b
am ba5f10a5
: Merge "libziparchive: fix clang build"
...
* commit 'ba5f10a565f0ba79bf72456852665e705de3b381':
libziparchive: fix clang build
2015-04-27 17:28:58 +00:00
Greg Hackmann
ba5f10a565
Merge "libziparchive: fix clang build"
2015-04-27 17:16:25 +00:00