JP Abgrall
af0dddab41
Merge "fs_mgr: recognize a notrim mountpoint flag"
2015-03-09 23:02:07 +00:00
Dan Albert
bac3474a82
Move adb to C++.
...
I keep trying to clean things up and needing std::strings. Might as
well just do this now.
usb_linux_client.c is going to stay as C because GCC isn't smart
enough to deal with the designated initializers it uses (though for
some reason it is in C mode).
The Darwin files are staying as C because I don't have a way to test
that they build.
The Windows files are staying as C because while I can actually build
for them, it's slow and painful.
Change-Id: I75367d29205a9049d34460032b3bb36384f43941
2015-03-09 14:06:11 -07:00
Dan Albert
8414ce2ace
am ea998e0e: am 9b1fd969: Merge "Fix a writex transcription error."
...
* commit 'ea998e0ef975dbea2034ae4a7208c36c37eedfa7':
Fix a writex transcription error.
2015-03-09 20:42:42 +00:00
Dan Albert
ea998e0ef9
am 9b1fd969: Merge "Fix a writex transcription error."
...
* commit '9b1fd969a7b7f1c6f1ed19719f21d57001d3c461':
Fix a writex transcription error.
2015-03-09 20:35:54 +00:00
Dan Albert
9b1fd969a7
Merge "Fix a writex transcription error."
2015-03-09 20:29:07 +00:00
Dan Albert
f3519a8747
Fix a writex transcription error.
...
Change-Id: I71b11127d41ebac6caf68926089c5a3b99d8c21e
2015-03-09 13:22:02 -07:00
Dan Albert
756cc39739
am 8b09c276: am 332c2881: Merge "Make the root/unroot test more robust."
...
* commit '8b09c2761523dfb05eb9c220f680cf2bef9c940e':
Make the root/unroot test more robust.
2015-03-09 18:26:52 +00:00
Dan Albert
8b09c27615
am 332c2881: Merge "Make the root/unroot test more robust."
...
* commit '332c2881305549450b162d854b139611d7bdc42f':
Make the root/unroot test more robust.
2015-03-09 18:20:44 +00:00
Dan Albert
332c288130
Merge "Make the root/unroot test more robust."
2015-03-09 18:15:05 +00:00
Mark Salyzyn
5dbffeda03
am 296bb2af: am c50f767e: Merge "logd: build cleanup"
...
* commit '296bb2afeccab13841a42cc5f3941d4528be383a':
logd: build cleanup
2015-03-09 17:53:07 +00:00
Dan Albert
857d7db69d
Make the root/unroot test more robust.
...
* Check the current adb user to choose the order of root/unroot.
* Re-root the device when finished.
Change-Id: I47a14b89e2c405bd63722e4d2043fcc629fb5e58
2015-03-09 10:45:50 -07:00
Mark Salyzyn
296bb2afec
am c50f767e: Merge "logd: build cleanup"
...
* commit 'c50f767e7ea83fbf3d7dc8477292bccc413427dc':
logd: build cleanup
2015-03-09 17:44:35 +00:00
Mark Salyzyn
c50f767e7e
Merge "logd: build cleanup"
2015-03-09 17:20:08 +00:00
Mark Salyzyn
95b467888c
logd: build cleanup
...
- Hard code the "auditd" event tag
Change-Id: I5f76fd286628be5c0ca819e8ed775648c0d2fa44
2015-03-09 10:02:51 -07:00
Mark Salyzyn
bba894af3f
logcat: fortify help on filterspec
...
Bug: 19620794
Change-Id: I572ffb62d39d884d5102b0846a95b1a8216f3d41
2015-03-09 09:57:25 -07:00
Elliott Hughes
5e92a0876b
am b7b0eaff: am 1d9f784f: am 0ffaa2b7: Merge "Fix __android_log_assert to abort."
...
* commit 'b7b0eaff584c47506279d21ccf1d81f86fcc4369':
Fix __android_log_assert to abort.
2015-03-09 15:34:44 +00:00
Elliott Hughes
b7b0eaff58
am 1d9f784f: am 0ffaa2b7: Merge "Fix __android_log_assert to abort."
...
* commit '1d9f784f35a330f0b43dcd31574000d5ae5b5bd7':
Fix __android_log_assert to abort.
2015-03-09 15:27:42 +00:00
Elliott Hughes
1d9f784f35
am 0ffaa2b7: Merge "Fix __android_log_assert to abort."
...
* commit '0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370':
Fix __android_log_assert to abort.
2015-03-09 15:21:46 +00:00
Elliott Hughes
0ffaa2b75a
Merge "Fix __android_log_assert to abort."
2015-03-09 15:14:52 +00:00
Elliott Hughes
860dda72c4
am a746624a: am 965ec3e1: am 6385d626: Merge "Remove toolbox\'s obsolete \'wipe\' command."
...
* commit 'a746624ae5bdf8363a0cd941e269174fc5b13e47':
Remove toolbox's obsolete 'wipe' command.
2015-03-08 00:16:41 +00:00
Dmitriy Ivanov
f3180746e9
am d3bccfcf: am 418dd72e: am 137c819e: Merge "Remove some more gotos"
...
* commit 'd3bccfcfea60c9c3171f3577579ce7905c833935':
Remove some more gotos
2015-03-08 00:16:40 +00:00
Elliott Hughes
425632993e
am b0dbe4be: am 3f421e4d: am d73df6ab: Merge "Fix outdated comments in grab-bootchart.sh."
...
* commit 'b0dbe4bef639672d33b49d1e9136f78894b2fe3c':
Fix outdated comments in grab-bootchart.sh.
2015-03-08 00:16:38 +00:00
Dmitriy Ivanov
1d4f844890
am 4371d8c5: am 9ae0abb2: am 3445cfe2: Merge "Reapply -Wold-style-cast"
...
* commit '4371d8c5ce1c15946fb52e60244f218b62e6036a':
Reapply -Wold-style-cast
2015-03-08 00:16:37 +00:00
Dmitriy Ivanov
52e1798c39
am 11cd49d2: am 6821d0b6: am 25d2a1a9: Merge "Fix build: Remove -Wold-style-cast"
...
* commit '11cd49d284464e7fb972e0475e7a71281ba53212':
Fix build: Remove -Wold-style-cast
2015-03-08 00:16:36 +00:00
Mark Salyzyn
4d67164436
am 6c06c654: am cd9afa1c: am 4f0520fe: Merge "Revert "liblog: logprint use <endian.h>""
...
* commit '6c06c65437abee5c445c4a7d4a416b218f120a93':
Revert "liblog: logprint use <endian.h>"
2015-03-08 00:16:35 +00:00
Dmitriy Ivanov
0cf718594a
am eae3f0fe: am 80a37e9a: am 34671b81: Merge "Remove some gotos"
...
* commit 'eae3f0febd1fb5e1b0b5f89826e8f13c6d6a67b0':
Remove some gotos
2015-03-08 00:16:33 +00:00
Dmitriy Ivanov
56138aad1e
am 12eb17b4: am 3ff6dd93: am 8b1a94c0: Merge "Cleanup old-style-cast warnings"
...
* commit '12eb17b40be9247de8717a4edfb3619d6535e8c4':
Cleanup old-style-cast warnings
2015-03-08 00:16:32 +00:00
Dmitriy Ivanov
32a8032385
am 27959e76: am d1ce7256: am 4b8b148a: Merge "Remove unnecessary allocation of FileMaps"
...
* commit '27959e76750f5c2073b1bb3ea193619d11d418cb':
Remove unnecessary allocation of FileMaps
2015-03-08 00:16:31 +00:00
Elliott Hughes
a746624ae5
am 965ec3e1: am 6385d626: Merge "Remove toolbox\'s obsolete \'wipe\' command."
...
* commit '965ec3e1d7ab194357bcc4cf4f126e5b7969e0a8':
Remove toolbox's obsolete 'wipe' command.
2015-03-08 00:08:41 +00:00
Dmitriy Ivanov
d3bccfcfea
am 418dd72e: am 137c819e: Merge "Remove some more gotos"
...
* commit '418dd72eb7d0c5b6a4eeadb37493cffa78103bfb':
Remove some more gotos
2015-03-08 00:07:57 +00:00
Elliott Hughes
b0dbe4bef6
am 3f421e4d: am d73df6ab: Merge "Fix outdated comments in grab-bootchart.sh."
...
* commit '3f421e4d7a1e3d8cf8d4abc7ae68fdf1bd0ff1be':
Fix outdated comments in grab-bootchart.sh.
2015-03-08 00:07:56 +00:00
Dmitriy Ivanov
4371d8c5ce
am 9ae0abb2: am 3445cfe2: Merge "Reapply -Wold-style-cast"
...
* commit '9ae0abb2e6f03f44aa87d41c157099275a1e00c5':
Reapply -Wold-style-cast
2015-03-08 00:07:55 +00:00
Dmitriy Ivanov
11cd49d284
am 6821d0b6: am 25d2a1a9: Merge "Fix build: Remove -Wold-style-cast"
...
* commit '6821d0b62350d09247377f86d3cbd6cb8b2e7a6b':
Fix build: Remove -Wold-style-cast
2015-03-08 00:07:54 +00:00
Mark Salyzyn
6c06c65437
am cd9afa1c: am 4f0520fe: Merge "Revert "liblog: logprint use <endian.h>""
...
* commit 'cd9afa1c27b70043a7bedabf1131d1e3c34d23e3':
Revert "liblog: logprint use <endian.h>"
2015-03-08 00:07:49 +00:00
Dmitriy Ivanov
eae3f0febd
am 80a37e9a: am 34671b81: Merge "Remove some gotos"
...
* commit '80a37e9abd9a9fa7d262280a37195dc3e9ff50da':
Remove some gotos
2015-03-08 00:07:48 +00:00
Dmitriy Ivanov
12eb17b40b
am 3ff6dd93: am 8b1a94c0: Merge "Cleanup old-style-cast warnings"
...
* commit '3ff6dd938b33345c5be601dbc763cf7664cecec4':
Cleanup old-style-cast warnings
2015-03-08 00:07:46 +00:00
Dmitriy Ivanov
27959e7675
am d1ce7256: am 4b8b148a: Merge "Remove unnecessary allocation of FileMaps"
...
* commit 'd1ce7256133616c98b1afce83a4ee19d83f9700a':
Remove unnecessary allocation of FileMaps
2015-03-08 00:07:45 +00:00
Elliott Hughes
965ec3e1d7
am 6385d626: Merge "Remove toolbox\'s obsolete \'wipe\' command."
...
* commit '6385d626a585017ec1fe4027f4faa79741f9d117':
Remove toolbox's obsolete 'wipe' command.
2015-03-07 19:24:25 +00:00
Elliott Hughes
02ff4b8feb
Fix __android_log_assert to abort.
...
If you rely on __builtin_trap, it's likely to use an illegal instruction,
which is a misleading way to abort. If we just call abort, it's more
immediately obvious that we've aborted.
Bug: 19644330
Change-Id: I63a962e4748aec7b019ea94b007593e478a3b61a
2015-03-07 11:21:37 -08:00
Elliott Hughes
6385d626a5
Merge "Remove toolbox's obsolete 'wipe' command."
2015-03-07 19:19:23 +00:00
Elliott Hughes
bfa9d6a3c4
Remove toolbox's obsolete 'wipe' command.
...
It hasn't worked in some time (it removes /data/dalvik-cache, which is
required by art), and if you're prepared to reboot (to let init put back
all the directories a working system needs) there are other ways to wipe
data (such as "fastboot format userdata reboot").
Bug: 19644330
Change-Id: Ib074ea21cc28409a506d66d75060bb4ad85539e2
2015-03-07 11:07:10 -08:00
Dmitriy Ivanov
418dd72eb7
am 137c819e: Merge "Remove some more gotos"
...
* commit '137c819e16b757478807d89c4ac40d0b9dad6737':
Remove some more gotos
2015-03-07 17:09:18 +00:00
Elliott Hughes
3f421e4d7a
am d73df6ab: Merge "Fix outdated comments in grab-bootchart.sh."
...
* commit 'd73df6abb684d04b0ddb3835013706ac4b6ac27b':
Fix outdated comments in grab-bootchart.sh.
2015-03-07 17:09:17 +00:00
Dmitriy Ivanov
9ae0abb2e6
am 3445cfe2: Merge "Reapply -Wold-style-cast"
...
* commit '3445cfe2b2461441d377aff0b00edd82fdf4f1ec':
Reapply -Wold-style-cast
2015-03-07 17:09:16 +00:00
Dmitriy Ivanov
137c819e16
Merge "Remove some more gotos"
2015-03-06 22:38:06 +00:00
Dmitriy Ivanov
1f741e51bc
Remove some more gotos
...
Change-Id: I9c4b3a5aecf4011653933b051e67605a6feb123f
2015-03-06 14:26:37 -08:00
Elliott Hughes
d73df6abb6
Merge "Fix outdated comments in grab-bootchart.sh."
2015-03-06 22:18:55 +00:00
Eino-Ville Talvala
5938f30921
Merge "Add ANativeWindow dataSpace; update graphics formats, color spaces"
2015-03-06 22:13:06 +00:00
Dmitriy Ivanov
3445cfe2b2
Merge "Reapply -Wold-style-cast"
2015-03-06 22:09:20 +00:00
Dmitriy Ivanov
f94e159007
Reapply -Wold-style-cast
...
Added pragmas to disable checks for the method
using libz.h macros.
Change-Id: I25aa1adf09f3ecff61d8fea6306b24b37990ab46
2015-03-06 13:57:43 -08:00