Andy Hung
6db2d260b2
Merge "Disable sanitization for LinearTransform" am: c52b3c08fa
am: 0d3b144372
...
am: eb1adff81e
* commit 'eb1adff81e8d7752248c42c4dcb525ec085853e1':
Disable sanitization for LinearTransform
2015-10-22 19:50:52 +00:00
Andy Hung
eb1adff81e
Merge "Disable sanitization for LinearTransform" am: c52b3c08fa
...
am: 0d3b144372
* commit '0d3b1443724dd5d70c3059c63b0bd19a8d43de93':
Disable sanitization for LinearTransform
2015-10-22 19:48:42 +00:00
Andy Hung
0d3b144372
Merge "Disable sanitization for LinearTransform"
...
am: c52b3c08fa
* commit 'c52b3c08fa5ea3680ffcd68c2a1d0542d09f0509':
Disable sanitization for LinearTransform
2015-10-22 19:46:20 +00:00
Andy Hung
c52b3c08fa
Merge "Disable sanitization for LinearTransform"
2015-10-22 19:43:23 +00:00
Andy Hung
13c19e7703
Disable sanitization for LinearTransform
...
Avoids potential crash on Fugu.
Bug: 25160007
Change-Id: I2e883539e36204821f3eb97f0ae4a4854014f048
2015-10-22 11:20:45 -07:00
Chong Zhang
e82f9b0a13
Merge "lmkd: allow client to use oom score in [-1000, 1000]"
2015-10-22 01:48:53 +00:00
Paul Lawrence
1e6c0191b2
Merge "Don\'t show UI on default encryption" into mnc-dr-dev am: 2b216aa89b
am: ba1d268273
-s ours
...
am: 1cca7114cd
* commit '1cca7114cd8ef2bd2029e87fc53a71b4f916df03':
Don't show UI on default encryption
2015-10-21 16:52:48 +00:00
Paul Lawrence
1cca7114cd
Merge "Don\'t show UI on default encryption" into mnc-dr-dev am: 2b216aa89b
...
am: ba1d268273
-s ours
* commit 'ba1d268273afdb954564fb5d75700cbe93a5dcac':
Don't show UI on default encryption
2015-10-21 16:46:59 +00:00
Paul Lawrence
ba1d268273
Merge "Don\'t show UI on default encryption" into mnc-dr-dev
...
am: 2b216aa89b
* commit '2b216aa89b76dbadb315322e4fd31aa37059b262':
Don't show UI on default encryption
2015-10-21 14:58:50 +00:00
Tim Murray
e41937d9b3
Reorder init.rc to avoid a kernel warning. am: f429d37807
am: e56b566401
...
am: 538697b315
* commit '538697b3153a9a71bdfd197d0461a74d29fd2fae':
Reorder init.rc to avoid a kernel warning.
2015-10-21 14:50:03 +00:00
Elliott Hughes
bdfbf76b31
Merge "Fix parameter to lseek" am: 4a8d1255de
am: 9f1edaece7
...
am: fd31be08f2
* commit 'fd31be08f254b70278f97dcbc432af2ee67c0848':
Fix parameter to lseek
2015-10-21 14:49:56 +00:00
Elliott Hughes
8a88377be4
Merge "Fix lseek argument order." am: 56543606b5
am: 5d5e8c2f4d
...
am: 6b66ac6a29
* commit '6b66ac6a29a8f20153c8edbce0bd128a37db393c':
Fix lseek argument order.
2015-10-21 14:49:29 +00:00
Paul Lawrence
2b216aa89b
Merge "Don't show UI on default encryption" into mnc-dr-dev
2015-10-21 14:27:38 +00:00
Tim Murray
538697b315
Reorder init.rc to avoid a kernel warning. am: f429d37807
...
am: e56b566401
* commit 'e56b566401aad8e7175306b2969f78baa0b8f9c6':
Reorder init.rc to avoid a kernel warning.
2015-10-20 22:14:47 +00:00
Tim Murray
e56b566401
Reorder init.rc to avoid a kernel warning.
...
am: f429d37807
* commit 'f429d37807a005c1de38a7616669bf1834d45432':
Reorder init.rc to avoid a kernel warning.
2015-10-20 22:08:36 +00:00
Elliott Hughes
fd31be08f2
Merge "Fix parameter to lseek" am: 4a8d1255de
...
am: 9f1edaece7
* commit '9f1edaece773f6d0a6f0365cfd934871d73136c2':
Fix parameter to lseek
2015-10-20 21:54:14 +00:00
Elliott Hughes
9f1edaece7
Merge "Fix parameter to lseek"
...
am: 4a8d1255de
* commit '4a8d1255dec24716b537a742ae67c0bc5ad8a41e':
Fix parameter to lseek
2015-10-20 21:44:21 +00:00
Elliott Hughes
4a8d1255de
Merge "Fix parameter to lseek"
2015-10-20 21:36:49 +00:00
caozhiyuan
f21f0f16e7
Fix parameter to lseek
...
Change-Id: I9c497a3ebc24ca1db92d0b9d3d1e9ac49dc40f75
2015-10-20 14:15:31 -07:00
Elliott Hughes
6b66ac6a29
Merge "Fix lseek argument order." am: 56543606b5
...
am: 5d5e8c2f4d
* commit '5d5e8c2f4d7e44e620c401b3b68730dd1a563437':
Fix lseek argument order.
2015-10-20 20:48:26 +00:00
Elliott Hughes
5d5e8c2f4d
Merge "Fix lseek argument order."
...
am: 56543606b5
* commit '56543606b55e1e1455ef5c0bf9aa9f4febab967f':
Fix lseek argument order.
2015-10-20 20:37:05 +00:00
Elliott Hughes
56543606b5
Merge "Fix lseek argument order."
2015-10-20 20:28:05 +00:00
Mike Frysinger
04766e5ae3
Merge "crash_reporter: add missing mkdir for crash_server rule" am: 0a85d04610
am: 7c4c3e9b15
...
am: 4d7a16f1ae
* commit '4d7a16f1aebff1af5b14c062c9fe545359c4888f':
crash_reporter: add missing mkdir for crash_server rule
2015-10-20 20:19:05 +00:00
Elliott Hughes
c96de0d36e
Fix lseek argument order.
...
Change-Id: I12feed2de8a4e0782f90609254a3e2ec66d7d98e
2015-10-20 13:18:22 -07:00
Sami Tolvanen
212b8819b4
Merge "adb: use libfec in disable-verity" am: ed38714426
am: 17e80ff5fc
...
am: 2b137d7485
* commit '2b137d7485c20adad0dbe80e824ea571d1227ea8':
adb: use libfec in disable-verity
2015-10-20 20:17:58 +00:00
Elliott Hughes
1e0e7a9bff
am 3f9ad41e: am c2492937: Merge "adb: win32: Improve Winsock error code mappings and strings"
...
am: 65fc882b8a
* commit '65fc882b8a73104869d37394b38fe943d9229ba0':
adb: win32: Improve Winsock error code mappings and strings
2015-10-20 20:13:39 +00:00
Mike Frysinger
4d7a16f1ae
Merge "crash_reporter: add missing mkdir for crash_server rule" am: 0a85d04610
...
am: 7c4c3e9b15
* commit '7c4c3e9b15b2f77dd3c785e27f9702a602433a73':
crash_reporter: add missing mkdir for crash_server rule
2015-10-20 20:11:39 +00:00
Mike Frysinger
7c4c3e9b15
Merge "crash_reporter: add missing mkdir for crash_server rule"
...
am: 0a85d04610
* commit '0a85d046108179c5c6ce2b70292da9ee7055801d':
crash_reporter: add missing mkdir for crash_server rule
2015-10-20 19:25:36 +00:00
Mike Frysinger
0a85d04610
Merge "crash_reporter: add missing mkdir for crash_server rule"
2015-10-20 18:59:35 +00:00
Mike Frysinger
cb31b1db9c
crash_reporter: add missing mkdir for crash_server rule
...
When doing a clean build, creating this file fails because the dir does
not yet exist:
echo "" > out/target/product/brilloemulator_arm/obj/ETC/crash_server_intermediates/crash_server
/bin/bash: out/target/product/brilloemulator_arm/obj/ETC/crash_server_intermediates/crash_server: No such file or directory
Bug: 24989289
Change-Id: If204dc0eb32e95ee66f97b568b4b9ae4050d3591
2015-10-20 14:28:08 -04:00
Sami Tolvanen
2b137d7485
Merge "adb: use libfec in disable-verity" am: ed38714426
...
am: 17e80ff5fc
* commit '17e80ff5fc161900e83a7e200832e65be003be2e':
adb: use libfec in disable-verity
2015-10-20 14:44:45 +00:00
Sami Tolvanen
17e80ff5fc
Merge "adb: use libfec in disable-verity"
...
am: ed38714426
* commit 'ed38714426b0f6bf67057dd28d6417a13807590c':
adb: use libfec in disable-verity
2015-10-20 14:41:03 +00:00
Sami Tolvanen
ed38714426
Merge "adb: use libfec in disable-verity"
2015-10-20 14:34:29 +00:00
Sami Tolvanen
8ad80763e4
adb: use libfec in disable-verity
...
Use libfec to locate verity metadata and disable verity.
Needs changes from
I02f83b0d1d4e7ef5cd5d13a37ff0b84f17e23376
Bug: 21893453
Change-Id: Ib43c352400a368664c949c7b8c9961829adf48f4
2015-10-20 13:55:24 +01:00
Elliott Hughes
65fc882b8a
am 3f9ad41e: am c2492937: Merge "adb: win32: Improve Winsock error code mappings and strings"
...
* commit '3f9ad41e0a1d23c3d8801733dbcb728f109c232e':
adb: win32: Improve Winsock error code mappings and strings
2015-10-19 21:17:03 +00:00
Elliott Hughes
3f9ad41e0a
am c2492937: Merge "adb: win32: Improve Winsock error code mappings and strings"
...
* commit 'c24929373ec0686e0695320d8f10f3bf4fc4547e':
adb: win32: Improve Winsock error code mappings and strings
2015-10-19 14:09:12 -07:00
Elliott Hughes
c24929373e
Merge "adb: win32: Improve Winsock error code mappings and strings"
2015-10-19 18:52:59 +00:00
Chong Zhang
0a4acdfca0
lmkd: allow client to use oom score in [-1000, 1000]
...
bug: 21411311
Change-Id: I20ddd1b30881712d03b5f85f270e1b56661fdfd1
2015-10-19 09:37:32 -07:00
Spencer Low
0a79600e72
adb: win32: Improve Winsock error code mappings and strings
...
Improved mapping of Winsock error codes to POSIX error codes, especially
WSAECONNABORTED to EPIPE (which WriteFdExactly() looks for) when sending
to a closed socket and WSAECONNRESET to ECONNRESET when the peer resets
the connection.
Use a macro to map strerror() to adb_strerror() which handles these
POSIX error codes that the Windows C Runtime doesn't recognize.
Also:
* Unittest for adb_strerror().
* Don't trace when send() returns WSAEWOULDBLOCK because that is
expected.
Change-Id: If46aeb7b36de3eebfbbccf5478ff5b1bb087714b
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-10-18 16:45:09 -07:00
Daniel Erat
d536084304
am b273fafa: am 48715301: am fb371d6a: Merge "libbinderwrapper: Add GetCallingUid() and GetCallingPid()."
...
* commit 'b273fafa56be7fa960e8fa0737342d8adf2ec4b7':
libbinderwrapper: Add GetCallingUid() and GetCallingPid().
2015-10-16 22:04:31 +00:00
Daniel Erat
b273fafa56
am 48715301: am fb371d6a: Merge "libbinderwrapper: Add GetCallingUid() and GetCallingPid()."
...
* commit '487153014b508d73dd2eae4bfdacafb27df195f7':
libbinderwrapper: Add GetCallingUid() and GetCallingPid().
2015-10-16 21:55:47 +00:00
Daniel Erat
487153014b
am fb371d6a: Merge "libbinderwrapper: Add GetCallingUid() and GetCallingPid()."
...
* commit 'fb371d6a6bc59be3eebf089b93b5aa07ad13b5b2':
libbinderwrapper: Add GetCallingUid() and GetCallingPid().
2015-10-16 14:49:42 -07:00
Elliott Hughes
0e11c98f91
am a3304859: am 8eb8f3ba: am 4d7591b9: Merge "fix misuse of formatting specifiers"
...
* commit 'a33048599dd501588bca89d641dab5bf21975fce':
fix misuse of formatting specifiers
2015-10-16 21:45:15 +00:00
Daniel Erat
fb371d6a6b
Merge "libbinderwrapper: Add GetCallingUid() and GetCallingPid()."
2015-10-16 21:43:36 +00:00
Elliott Hughes
a33048599d
am 8eb8f3ba: am 4d7591b9: Merge "fix misuse of formatting specifiers"
...
* commit '8eb8f3ba6c39bbc369d88ad35d631f86f90aed16':
fix misuse of formatting specifiers
2015-10-16 21:40:22 +00:00
Elliott Hughes
8eb8f3ba6c
am 4d7591b9: Merge "fix misuse of formatting specifiers"
...
* commit '4d7591b98e2bb066c1a151ef21fe5fc4bb0ed19b':
fix misuse of formatting specifiers
2015-10-16 14:35:43 -07:00
Elliott Hughes
4d7591b98e
Merge "fix misuse of formatting specifiers"
2015-10-16 21:28:36 +00:00
Steve Fung
7744e1a782
am dc45e39b: am f14e5c6b: am 2218720d: Merge "crash_reporter: Use os-release.d to store the crash server url"
...
* commit 'dc45e39b4e007d41b23736cd44c212c8c7fb618d':
crash_reporter: Use os-release.d to store the crash server url
2015-10-16 17:45:44 +00:00
Adam Lesinski
cefe2a2c59
am bc9dec80: am b7ccd83f: am 39477373: Merge "Implement ZipWriter for quickly writing ZipFiles."
...
* commit 'bc9dec80b87a55332f9f60bb4ca75971186fb1fa':
Implement ZipWriter for quickly writing ZipFiles.
2015-10-16 17:45:40 +00:00
Steve Fung
dc45e39b4e
am f14e5c6b: am 2218720d: Merge "crash_reporter: Use os-release.d to store the crash server url"
...
* commit 'f14e5c6bc667b4ad0316a8dd2c90fadc903ee77d':
crash_reporter: Use os-release.d to store the crash server url
2015-10-16 17:26:24 +00:00