Elliott Hughes
615af25ffd
am a421c1e5: Merge "Possible Mac build fix."
...
* commit 'a421c1e5bc32ef29bdfa8d065f27b7ea950f12a2':
Possible Mac build fix.
2015-08-26 01:01:18 +00:00
Elliott Hughes
a421c1e5bc
Merge "Possible Mac build fix."
2015-08-26 00:54:10 +00:00
Elliott Hughes
62077d32a2
Possible Mac build fix.
...
The error was this:
system/core/adb/usb_osx.cpp:203:74: error: values of type 'UInt32' should not
be used as format arguments; add an explicit cast to 'unsigned int' instead
[-Werror,-Wformat]
snprintf(devpathBuf, sizeof(devpathBuf), "usb:%" PRIu32 "X", locationId);
~~~ ^~~~~~~~~~
(unsigned int)
Which seems to be because on LP64 UInt32 is "unsigned int" but on LP32 it was
"unsigned long". We don't have to care about LP32, so -- if we can -- we're
probably better off just using uint32_t instead of UInt32.
Change-Id: I576f76cf2016ee59caccbc317ef74b6e8d71d722
2015-08-25 17:48:12 -07:00
Elliott Hughes
9492db23b9
am 62643302: Merge "Not all filesystems support setting SELinux labels."
...
* commit '626433024df69520b0b45da563b8afce750b25c6':
Not all filesystems support setting SELinux labels.
2015-08-26 00:22:00 +00:00
Elliott Hughes
626433024d
Merge "Not all filesystems support setting SELinux labels."
2015-08-26 00:18:44 +00:00
Ruchi Kandoi
62729a1d19
am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties."
...
* commit '565e4c6a43c0d05c1a4fea03cdb47c04b6eea10b':
healthd: Adds cycle_count, current_now and full_charge properties.
2015-08-25 23:53:36 +00:00
Ruchi Kandoi
565e4c6a43
Merge "healthd: Adds cycle_count, current_now and full_charge properties."
2015-08-25 23:45:42 +00:00
Elliott Hughes
383444085a
Not all filesystems support setting SELinux labels.
...
Bug: http://b/23530370
Change-Id: Ie4deb3544304754696f049d17b12168cad4a51fd
2015-08-25 16:33:50 -07:00
Steve Fung
c734ac274a
am c3d61786: Merge "crash_reporter: Run with supplemental groups"
...
* commit 'c3d61786f088f0887f1dd5ad0498aa927148b0f0':
crash_reporter: Run with supplemental groups
2015-08-25 23:03:55 +00:00
Steve Fung
c3d61786f0
Merge "crash_reporter: Run with supplemental groups"
2015-08-25 22:56:56 +00:00
Elliott Hughes
1ce12d397f
am 43f43d87: Merge "Move adb\'s selinux_android_restorecon up and check for failures."
...
* commit '43f43d8792ffc91df085a787feecdb0cfd225b47':
Move adb's selinux_android_restorecon up and check for failures.
2015-08-25 20:34:17 +00:00
Elliott Hughes
43f43d8792
Merge "Move adb's selinux_android_restorecon up and check for failures."
2015-08-25 20:26:59 +00:00
Elliott Hughes
0adc09721f
Move adb's selinux_android_restorecon up and check for failures.
...
Change-Id: Ib3ff282cf52df03f3b9a0abecf0abda99d7df641
2015-08-25 13:14:07 -07:00
Elliott Hughes
12d762e176
am e8e272c5: Merge "EINTR is handled by adb_read/unix_read and friends."
...
* commit 'e8e272c525fdfe73e646ff94f8b4d1913016919f':
EINTR is handled by adb_read/unix_read and friends.
2015-08-25 19:57:12 +00:00
Elliott Hughes
e8e272c525
Merge "EINTR is handled by adb_read/unix_read and friends."
2015-08-25 19:51:01 +00:00
Elliott Hughes
068ee4d03f
am a0f02fa9: Merge "Fix the fs_config call."
...
* commit 'a0f02fa9e3ca779ed69264fc0977f530328c3f15':
Fix the fs_config call.
2015-08-25 18:15:53 +00:00
Elliott Hughes
3ecba7f95c
am 61ab1618: Merge "Fix 32-bit build."
...
* commit '61ab1618a8347c503e9185a4d17b957e367bac1b':
Fix 32-bit build.
2015-08-25 18:15:51 +00:00
Elliott Hughes
a0f02fa9e3
Merge "Fix the fs_config call."
2015-08-25 18:11:06 +00:00
Elliott Hughes
7baecbe6a3
Fix the fs_config call.
...
fs_config ORs in bits to the existing mode value.
Change-Id: I23f0655f9c4c8c8dc43ed979f3b519d7c03a11f8
2015-08-25 11:09:04 -07:00
Elliott Hughes
61ab1618a8
Merge "Fix 32-bit build."
2015-08-25 18:06:19 +00:00
Elliott Hughes
56bf309843
Fix 32-bit build.
...
fs_config uses "unsigned int" instead of mode_t. Work around this.
Change-Id: I57b97d5bfc1b88089a41b4e8a50f1391b5c5113b
2015-08-25 11:01:39 -07:00
Elliott Hughes
8fcd8bc046
EINTR is handled by adb_read/unix_read and friends.
...
No need to clutter the code with cases that won't happen.
Change-Id: I47c5a2e6170f902d2618719f44492234a4869567
2015-08-25 10:59:45 -07:00
Elliott Hughes
ba8fc8293f
am d3c72606: Merge "Clean up error handling/reporting in file_sync_service.cpp."
...
* commit 'd3c726064aa8e676ca4756e8461a5732b16aa7a9':
Clean up error handling/reporting in file_sync_service.cpp.
2015-08-25 17:50:51 +00:00
Elliott Hughes
d3c726064a
Merge "Clean up error handling/reporting in file_sync_service.cpp."
2015-08-25 17:46:02 +00:00
Elliott Hughes
fdd4e58868
Clean up error handling/reporting in file_sync_service.cpp.
...
In an earlier code review it was pointed out that there was something
very weird about fail_errno. It didn't seem to make sense that we'd
often try to continue after reporting failure. This patch cleans up
all that and assumes that if we've reported failure to the client,
we should stop what we're doing.
Bug: http://b/23437039
Change-Id: I39c38650ed9f9d5e30adbf68a7545c9e4a6ab812
2015-08-25 08:41:05 -07:00
Steve Fung
b440e50b6f
crash_reporter: Run with supplemental groups
...
In order to use metrics_lib, crash_reporter needs to be run with
system group permissions. To use dbus, it needs dbus group
permissions.
Bug: 23406290
Change-Id: Ic679a057afa46aaadd59429aab0aea072c1973c5
2015-08-24 23:56:07 -07:00
Elliott Hughes
e55e820e66
am e13fd9aa: Merge "lsof fixes."
...
* commit 'e13fd9aa231b117b03be6b84b7fb0debe6cb620d':
lsof fixes.
2015-08-25 00:46:24 +00:00
Elliott Hughes
e13fd9aa23
Merge "lsof fixes."
2015-08-25 00:37:49 +00:00
Elliott Hughes
703a3f1d07
lsof fixes.
...
Change-Id: Ie3befc7c8e3540b9ebe93786e711f8445cf6f6c7
2015-08-24 17:21:31 -07:00
Tom Cherry
9b2bc34765
am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '77d634f7dddf983605619f83bbacbe8ff27a23bc':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:28:36 +00:00
Tom Cherry
77d634f7dd
Merge "remove TARGET_PROVIDES_INIT_RC"
2015-08-24 23:23:36 +00:00
Elliott Hughes
6c04e9a9ec
am 42640e52: Merge "Add missing #include <memory> for std::unique_ptr on Windows."
...
* commit '42640e5224a861690de006952470451d18337256':
Add missing #include <memory> for std::unique_ptr on Windows.
2015-08-24 21:56:37 +00:00
Elliott Hughes
42640e5224
Merge "Add missing #include <memory> for std::unique_ptr on Windows."
2015-08-24 21:50:26 +00:00
Elliott Hughes
a925dba0e0
Add missing #include <memory> for std::unique_ptr on Windows.
...
Change-Id: Ic02f53003a20a646cbbf2aa08e0e10be9bd8b97f
2015-08-24 14:49:43 -07:00
Nick Kralevich
7ec4c228ee
am e80ec0c5: Merge "libutils: Enable LOCAL_SANITIZE := integer"
...
* commit 'e80ec0c5609d509b17e3e8497a0e0ec5b9caa2e4':
libutils: Enable LOCAL_SANITIZE := integer
2015-08-24 21:45:36 +00:00
Nick Kralevich
e80ec0c560
Merge "libutils: Enable LOCAL_SANITIZE := integer"
2015-08-24 21:39:28 +00:00
Elliott Hughes
5c027334cc
am 93b9e865: Merge "There are no big endian hosts, grandpa."
...
* commit '93b9e8653e95d711b4df163febd662fc022de72a':
There are no big endian hosts, grandpa.
2015-08-24 21:36:56 +00:00
Elliott Hughes
93b9e8653e
Merge "There are no big endian hosts, grandpa."
2015-08-24 21:29:31 +00:00
Elliott Hughes
f4465203b6
There are no big endian hosts, grandpa.
...
Change-Id: I6f64f702f919fe4af10d82c5f395a051571815ed
2015-08-24 14:27:03 -07:00
Tom Cherry
0ea4ffdc06
remove TARGET_PROVIDES_INIT_RC
...
Change-Id: I15105a8dc11e218d95d4f5a4cee5b2a166d3d639
2015-08-24 13:56:43 -07:00
Elliott Hughes
c583c5112b
am 186f1dee: Merge "adb sync cleanup."
...
* commit '186f1dee2afc15c8941a1f78e1aa97e2ec9970ee':
adb sync cleanup.
2015-08-24 20:51:42 +00:00
Elliott Hughes
186f1dee2a
Merge "adb sync cleanup."
2015-08-24 20:48:01 +00:00
Ruchi Kandoi
cc338801e4
healthd: Adds cycle_count, current_now and full_charge properties.
...
Bug: 22981343
Change-Id: I4b942b891f61e6bf12e3b23f4e0ada5b7f14fd83
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2015-08-24 13:01:16 -07:00
Elliott Hughes
aa24549190
adb sync cleanup.
...
We can double the speed of "adb sync" (on N9) if we increase SYNC_DATA_MAX
from 64KiB to 256KiB. This change doesn't do that, because I still haven't
managed to plumb through the information about whether we're a new adb/adbd
to file_sync_client.cpp and file_sync_service.cpp. But this is already a big
change with a lot of cleanup, so let's do the cleanup and worry about the
intended change another day...
This change does improve performance somewhat by halving the number of
lstat(2) calls made on the client side, and ensuring that most packets are
sent with a single write. This has the pleasing result of making the null
sync on an AOSP N9 go from just over 300ms to around 100ms, which means it
now seems instantaneous (https://en.wikipedia.org/wiki/Mental_chronometry ).
Change-Id: If9f6d4c1f93ec752b95f71211bbbb1c513045166
2015-08-24 11:15:01 -07:00
Nick Kralevich
4d587f2f9a
libutils: Enable LOCAL_SANITIZE := integer
...
Call abort() on undefined or sketchy integer behavior.
Protects against integer overflow attacks.
Change-Id: I475e5e9fb04160dd2d201e926ab2b897539f8bb6
2015-08-24 10:51:38 -07:00
Badhri Jagan Sridharan
46f24955c8
am e3c02883: Merge "adbd: enable USB SuperSpeed (again)"
...
* commit 'e3c028836f892e74c737c8b16ff96321cee82d25':
adbd: enable USB SuperSpeed (again)
2015-08-24 17:41:04 +00:00
Badhri Jagan Sridharan
e3c028836f
Merge "adbd: enable USB SuperSpeed (again)"
2015-08-24 17:33:20 +00:00
Nick Kralevich
4f0a7cb8e1
am 786e5e26: Merge "libutils: cleanups for -fsanitize=integer"
...
* commit '786e5e263bdc716f4b2d871191e64726e552acdb':
libutils: cleanups for -fsanitize=integer
2015-08-24 15:56:42 +00:00
Nick Kralevich
786e5e263b
Merge "libutils: cleanups for -fsanitize=integer"
2015-08-24 15:52:57 +00:00
Nick Kralevich
1f28698998
libutils: cleanups for -fsanitize=integer
...
* Hashing functions rely on integer overflow behavior.
Mark those functions as safe.
* abort() if a passed in size_t value is greater than
UINT32_MAX. This can occur on 64 bit builds where size_t
is larger than uint32_t.
* Special case the index lookup for an empty sorted vector.
Without the special case, size() == 0, and size()-1 underflows.
Change-Id: I343a14b589fc8f0d221c1998ae5d6f0b9e2781f8
2015-08-24 15:52:22 +00:00