Mark Salyzyn
851bd8cc24
am 0c3177c5: am 64393789: Merge "logd: worst uid record watermark part deux"
...
* commit '0c3177c5b13b0826068f922f26f9b1eacbc0fac0':
logd: worst uid record watermark part deux
2015-08-26 18:13:09 +00:00
Mark Salyzyn
0c3177c5b1
am 64393789: Merge "logd: worst uid record watermark part deux"
...
* commit '64393789227b303fa142690efe34ab3ffc567475':
logd: worst uid record watermark part deux
2015-08-26 17:54:53 +00:00
Mark Salyzyn
6439378922
Merge "logd: worst uid record watermark part deux"
2015-08-26 17:49:53 +00:00
Elliott Hughes
dda47599d7
am b6ae989a: am 0ac29519: Merge "Don\'t build 32-bit host libadb."
...
* commit 'b6ae989acf9958632ce91d2f06fd185aeb9fd0d3':
Don't build 32-bit host libadb.
2015-08-26 03:47:48 +00:00
Elliott Hughes
ba2e8fca66
am 5e2e4fd5: am e2cda953: Merge "Fix missing <stdarg.h>."
...
* commit '5e2e4fd5c8fa4fd819b7080ad374a2a62b98ad82':
Fix missing <stdarg.h>.
2015-08-26 03:47:47 +00:00
Elliott Hughes
6aa68e81e2
am f4603673: am 04b94b25: Merge "Use 64-bit file sizes in fastboot."
...
* commit 'f46036732f7ac125bb4698d1d742c6a1299f7259':
Use 64-bit file sizes in fastboot.
2015-08-26 03:47:46 +00:00
Elliott Hughes
495c8a0603
am 615af25f: am a421c1e5: Merge "Possible Mac build fix."
...
* commit '615af25ffdde99331c173499446e08c3a7ec32a8':
Possible Mac build fix.
2015-08-26 03:47:44 +00:00
Elliott Hughes
1c3cc30fdb
am 9492db23: am 62643302: Merge "Not all filesystems support setting SELinux labels."
...
* commit '9492db23b9feeb589be36fece46e55dc66d7f1dd':
Not all filesystems support setting SELinux labels.
2015-08-26 03:47:42 +00:00
Ruchi Kandoi
ef1bb411cb
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 03:47:33 +00:00
Steve Fung
4a274dcdbf
am c734ac27: am c3d61786: Merge "crash_reporter: Run with supplemental groups"
...
* commit 'c734ac274aca9c9dbe299d85881a54b333d083cf':
crash_reporter: Run with supplemental groups
2015-08-26 02:54:11 +00:00
Elliott Hughes
b6ae989acf
am 0ac29519: Merge "Don\'t build 32-bit host libadb."
...
* commit '0ac29519ac75a72a4ecacffc819eff9adf5b1b70':
Don't build 32-bit host libadb.
2015-08-26 02:44:34 +00:00
Elliott Hughes
5e2e4fd5c8
am e2cda953: Merge "Fix missing <stdarg.h>."
...
* commit 'e2cda95341d5468eb9ee5d3552f7de5c572dd132':
Fix missing <stdarg.h>.
2015-08-26 02:40:57 +00:00
Elliott Hughes
0ac29519ac
Merge "Don't build 32-bit host libadb."
2015-08-26 02:38:51 +00:00
Elliott Hughes
daa6c463a9
Don't build 32-bit host libadb.
...
Change-Id: Ib6ad3db2dc160273d20fa14e0820f29ed649d75a
2015-08-25 19:38:14 -07:00
Elliott Hughes
e2cda95341
Merge "Fix missing <stdarg.h>."
2015-08-26 02:34:52 +00:00
Elliott Hughes
3ab8b859c2
Fix missing <stdarg.h>.
...
system/core/fastboot/engine.cpp:84:5: error: use of undeclared identifier 'va_start'
Change-Id: I8aff9a40d33f403c0d0d91a15638863fe24dca2e
2015-08-25 19:34:13 -07:00
Elliott Hughes
f46036732f
am 04b94b25: Merge "Use 64-bit file sizes in fastboot."
...
* commit '04b94b2571a0f90b55140f2d2748f2876fdfa408':
Use 64-bit file sizes in fastboot.
2015-08-26 02:19:31 +00:00
Elliott Hughes
04b94b2571
Merge "Use 64-bit file sizes in fastboot."
2015-08-26 02:12:50 +00:00
Elliott Hughes
fc79767fc2
Use 64-bit file sizes in fastboot.
...
Bug: 20110580
Change-Id: I5d3718103ff581ff3b5241c8b0e52b585b4f37e5
2015-08-25 19:11:52 -07:00
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
Sergio Giro
457132b436
am e1140e00: 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 'e1140e00a9b922bb88d8df2b58c3d5b2b92bc80a':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-26 00:14:49 +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
e1140e00a9
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:10 +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
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
900d4316d0
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:57 +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
c5c1cd1855
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:50 +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
78664c93e6
resolved conflicts for merge of 068ee4d0
to mnc-dr-dev-plus-aosp
...
Change-Id: Ie7b2673e24ce4880c20112d64164cec228ca5755
2015-08-25 11:26:40 -07:00
Elliott Hughes
7b507e5b83
resolved conflicts for merge of 3ecba7f9
to mnc-dr-dev-plus-aosp
...
Change-Id: Id62f6da9c0194facd91ad77c2ae4c115e68cd8a5
2015-08-25 11:23:27 -07:00
Elliott Hughes
9b2a22f3b5
resolved conflicts for merge of ba8fc829
to mnc-dr-dev-plus-aosp
...
Change-Id: I5d51c0eda73c30b1452166fc4f8e9bae8182d475
2015-08-25 11:18:17 -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