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
4f2015a155
am 9492db23
: am 62643302
: Merge "Not all filesystems support setting SELinux labels."
...
* commit '9492db23b9feeb589be36fece46e55dc66d7f1dd':
Not all filesystems support setting SELinux labels.
2015-08-26 00:30:33 +00:00
Ruchi Kandoi
9e8eb9930b
am 62729a1d
: am 565e4c6a
: Merge "healthd: Adds cycle_count, current_now and full_charge properties."
...
* commit '62729a1d195cd27b353da24be21bd0a855884431':
healthd: Adds cycle_count, current_now and full_charge properties.
2015-08-26 00:22:11 +00: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
Sergio Giro
361d16e707
am 09a474ac
: am ba4e6a80
: (-s ours) am bd7dd79e
: am 25592fbe
: am ca15dfd0
: am 3fe40514
: (-s ours) am 66b6eb94
: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '09a474ac72f9663212d090b3f7d5f03d96171c6d':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 23:45:23 +00:00
Sergio Giro
09a474ac72
am ba4e6a80
: (-s ours) am bd7dd79e
: am 25592fbe
: am ca15dfd0
: am 3fe40514
: (-s ours) am 66b6eb94
: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit 'ba4e6a804d2ac4577daa2f2db68857e1b01ce3bf':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 23:35:30 +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
Sergio Giro
ba4e6a804d
am bd7dd79e
: am 25592fbe
: am ca15dfd0
: am 3fe40514
: (-s ours) am 66b6eb94
: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit 'bd7dd79e8ce8edcba61249b4d263d20ed98c4c92':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 23:25:12 +00:00
Bertrand SIMONNET
2699362a57
metricsd: Use system properties to store build time metadata.
...
Instead of using /etc/lsb-release to store the version, channel and
build_target_id, use the Android system properties.
BUG: 22879642
Change-Id: Ic79e74bd14bf8e2c55549c08963a66700b49b544
2015-08-25 16:23:04 -07:00
Steve Fung
f079143b29
am c734ac27
: am c3d61786
: Merge "crash_reporter: Run with supplemental groups"
...
* commit 'c734ac274aca9c9dbe299d85881a54b333d083cf':
crash_reporter: Run with supplemental groups
2015-08-25 23:08:55 +00: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
39206a08d8
am 1ce12d39
: am 43f43d87
: Merge "Move adb\'s selinux_android_restorecon up and check for failures."
...
* commit '1ce12d397f1f563ee3eac4c1fdb907909d6eeff1':
Move adb's selinux_android_restorecon up and check for failures.
2015-08-25 20:43:55 +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
e4baae6d06
am 12d762e1
: am e8e272c5
: Merge "EINTR is handled by adb_read/unix_read and friends."
...
* commit '12d762e17694c0137aa7570b4b71536e59643bb0':
EINTR is handled by adb_read/unix_read and friends.
2015-08-25 20:02:46 +00: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
9ccf4bfbde
resolved conflicts for merge of 068ee4d0
to mnc-dev-plus-aosp
...
Change-Id: If276934797138d13fe8c56711615b477e05ee484
2015-08-25 11:24:45 -07:00
Elliott Hughes
9bc8005e07
resolved conflicts for merge of 3ecba7f9
to mnc-dev-plus-aosp
...
Change-Id: I46452c03bbda9604f2af2e1edce5d48c6865d436
2015-08-25 11:21:58 -07:00
Elliott Hughes
478bca2e72
resolved conflicts for merge of ba8fc829
to mnc-dev-plus-aosp
...
Change-Id: Ia4daf846df5a86ebca1b6c8d9e41f1633001836f
2015-08-25 11:16:36 -07: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
Sergio Giro
7c327194fe
am 1dda45c7
: am 0cc9a6e6
: libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
* commit '1dda45c7d7605be2601b2f95b90b5673d6bac78c':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-25 16:49:18 +00:00
Sergio Giro
1dda45c7d7
am 0cc9a6e6
: libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
* commit '0cc9a6e6e1f8e675c1238e5e05418cabcc699b52':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-25 16:43:54 +00:00
Sergio Giro
d95e47f136
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 66b6eb9490
)
Change-Id: I363f49b5b3c6b7b3ac08cba2c14d72c431588c5a
2015-08-25 17:40:47 +01:00
Sergio Giro
bd7dd79e8c
am 25592fbe
: am ca15dfd0
: am 3fe40514
: (-s ours) am 66b6eb94
: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '25592fbea0f38ea369a225e0ef9708442fc9e918':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 16:26:30 +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
Sergio Giro
0cc9a6e6e1
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 66b6eb9490
)
Change-Id: Ic71dd0025b9a7588c4f3bb1c7be1bd13d2ff5105
2015-08-25 16:18:16 +01:00
Sergio Giro
25592fbea0
am ca15dfd0
: am 3fe40514
: (-s ours) am 66b6eb94
: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit 'ca15dfd05cdeea7ed57578aa569831698324b2a0':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:19:08 +00:00
Sergio Giro
ca15dfd05c
am 3fe40514
: (-s ours) am 66b6eb94
: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '3fe4051430be1da4c1f119c165a4bb8b3a9dd499':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:11:49 +00:00
Sergio Giro
3fe4051430
am 66b6eb94
: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '66b6eb9490beeeabc804d790c1c4060ce047afd4':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:06:38 +00: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
9c24c4410c
am e55e820e
: am e13fd9aa
: Merge "lsof fixes."
...
* commit 'e55e820e663ae34091d079922f99804f1c004b80':
lsof fixes.
2015-08-25 00:52:29 +00: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
fbe3fa84ff
am 9b2bc347
: am 77d634f7
: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '9b2bc347659de454796acfc9402cbbc170efd133':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:20 +00: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