summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | am 296bb2af: am c50f767e: Merge "logd: build cleanup"Mark Salyzyn2015-03-091-1/+10
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '296bb2afeccab13841a42cc5f3941d4528be383a': logd: build cleanup
| | * | | | | am c50f767e: Merge "logd: build cleanup"Mark Salyzyn2015-03-091-1/+10
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c50f767e7ea83fbf3d7dc8477292bccc413427dc': logd: build cleanup
| | | * | | | Merge "logd: build cleanup"Mark Salyzyn2015-03-091-1/+10
| | | |\ \ \ \
| | | | * | | | logd: build cleanupMark Salyzyn2015-03-091-1/+10
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Hard code the "auditd" event tag Change-Id: I5f76fd286628be5c0ca819e8ed775648c0d2fa44
* | | | | | | Merge "fs_mgr: recognize a notrim mountpoint flag"JP Abgrall2015-03-093-0/+8
|\ \ \ \ \ \ \
| * | | | | | | fs_mgr: recognize a notrim mountpoint flagJP Abgrall2015-03-053-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some partitions don't need trimming. Needs a vold:fstrim change Bug: 19624276 Change-Id: I8df715bd18688d7921afa2f3743f7d2a68760699
* | | | | | | | am b7b0eaff: am 1d9f784f: am 0ffaa2b7: Merge "Fix __android_log_assert to ↵Elliott Hughes2015-03-092-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abort." * commit 'b7b0eaff584c47506279d21ccf1d81f86fcc4369': Fix __android_log_assert to abort.
| * | | | | | | am 1d9f784f: am 0ffaa2b7: Merge "Fix __android_log_assert to abort."Elliott Hughes2015-03-092-2/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '1d9f784f35a330f0b43dcd31574000d5ae5b5bd7': Fix __android_log_assert to abort.
| | * | | | | | am 0ffaa2b7: Merge "Fix __android_log_assert to abort."Elliott Hughes2015-03-092-2/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370': Fix __android_log_assert to abort.
| | | * | | | | Merge "Fix __android_log_assert to abort."Elliott Hughes2015-03-092-2/+2
| | | |\ \ \ \ \
| | | | * | | | | Fix __android_log_assert to abort.Elliott Hughes2015-03-072-2/+2
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am a746624a: am 965ec3e1: am 6385d626: Merge "Remove toolbox\'s obsolete ↵Elliott Hughes2015-03-082-177/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'wipe\' command." * commit 'a746624ae5bdf8363a0cd941e269174fc5b13e47': Remove toolbox's obsolete 'wipe' command.
| * | | | | | | am 965ec3e1: am 6385d626: Merge "Remove toolbox\'s obsolete \'wipe\' command."Elliott Hughes2015-03-082-177/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '965ec3e1d7ab194357bcc4cf4f126e5b7969e0a8': Remove toolbox's obsolete 'wipe' command.
| | * | | | | | am 6385d626: Merge "Remove toolbox\'s obsolete \'wipe\' command."Elliott Hughes2015-03-072-177/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6385d626a585017ec1fe4027f4faa79741f9d117': Remove toolbox's obsolete 'wipe' command.
| | | * | | | | Merge "Remove toolbox's obsolete 'wipe' command."Elliott Hughes2015-03-072-177/+0
| | | |\ \ \ \ \
| | | | * | | | | Remove toolbox's obsolete 'wipe' command.Elliott Hughes2015-03-072-177/+0
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am d3bccfcf: am 418dd72e: am 137c819e: Merge "Remove some more gotos"Dmitriy Ivanov2015-03-081-14/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3bccfcfea60c9c3171f3577579ce7905c833935': Remove some more gotos
| * | | | | | | am 418dd72e: am 137c819e: Merge "Remove some more gotos"Dmitriy Ivanov2015-03-081-14/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '418dd72eb7d0c5b6a4eeadb37493cffa78103bfb': Remove some more gotos
| | * | | | | | am 137c819e: Merge "Remove some more gotos"Dmitriy Ivanov2015-03-071-14/+13
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '137c819e16b757478807d89c4ac40d0b9dad6737': Remove some more gotos
| | | * | | | | Merge "Remove some more gotos"Dmitriy Ivanov2015-03-061-14/+13
| | | |\ \ \ \ \
| | | | * | | | | Remove some more gotosDmitriy Ivanov2015-03-061-14/+13
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c4b3a5aecf4011653933b051e67605a6feb123f
* | | | | | | | am b0dbe4be: am 3f421e4d: am d73df6ab: Merge "Fix outdated comments in ↵Elliott Hughes2015-03-081-7/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grab-bootchart.sh." * commit 'b0dbe4bef639672d33b49d1e9136f78894b2fe3c': Fix outdated comments in grab-bootchart.sh.
| * | | | | | | am 3f421e4d: am d73df6ab: Merge "Fix outdated comments in grab-bootchart.sh."Elliott Hughes2015-03-081-7/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f421e4d7a1e3d8cf8d4abc7ae68fdf1bd0ff1be': Fix outdated comments in grab-bootchart.sh.
| | * | | | | | am d73df6ab: Merge "Fix outdated comments in grab-bootchart.sh."Elliott Hughes2015-03-071-7/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd73df6abb684d04b0ddb3835013706ac4b6ac27b': Fix outdated comments in grab-bootchart.sh.
| | | * | | | | Merge "Fix outdated comments in grab-bootchart.sh."Elliott Hughes2015-03-061-7/+4
| | | |\ \ \ \ \
| | | | * | | | | Fix outdated comments in grab-bootchart.sh.Elliott Hughes2015-03-061-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've been deliberately vague about the name of the readme because I want to come back and switch to markdown, but that probably won't happen today. Change-Id: I60651703709bbfd499227f882eb949396e8f4f6c
* | | | | | | | | am 4371d8c5: am 9ae0abb2: am 3445cfe2: Merge "Reapply -Wold-style-cast"Dmitriy Ivanov2015-03-082-1/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4371d8c5ce1c15946fb52e60244f218b62e6036a': Reapply -Wold-style-cast
| * | | | | | | | am 9ae0abb2: am 3445cfe2: Merge "Reapply -Wold-style-cast"Dmitriy Ivanov2015-03-082-1/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ae0abb2e6f03f44aa87d41c157099275a1e00c5': Reapply -Wold-style-cast
| | * | | | | | | am 3445cfe2: Merge "Reapply -Wold-style-cast"Dmitriy Ivanov2015-03-072-1/+10
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3445cfe2b2461441d377aff0b00edd82fdf4f1ec': Reapply -Wold-style-cast
| | | * | | | | | Merge "Reapply -Wold-style-cast"Dmitriy Ivanov2015-03-062-1/+10
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Reapply -Wold-style-castDmitriy Ivanov2015-03-062-1/+10
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added pragmas to disable checks for the method using libz.h macros. Change-Id: I25aa1adf09f3ecff61d8fea6306b24b37990ab46
* | | | | | | | am 11cd49d2: am 6821d0b6: am 25d2a1a9: Merge "Fix build: Remove ↵Dmitriy Ivanov2015-03-081-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wold-style-cast" * commit '11cd49d284464e7fb972e0475e7a71281ba53212': Fix build: Remove -Wold-style-cast
| * | | | | | | am 6821d0b6: am 25d2a1a9: Merge "Fix build: Remove -Wold-style-cast"Dmitriy Ivanov2015-03-081-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6821d0b62350d09247377f86d3cbd6cb8b2e7a6b': Fix build: Remove -Wold-style-cast
| | * | | | | | am 25d2a1a9: Merge "Fix build: Remove -Wold-style-cast"Dmitriy Ivanov2015-03-061-1/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '25d2a1a916058634a23d89d287b18eb18c140081': Fix build: Remove -Wold-style-cast
| | | * | | | | Merge "Fix build: Remove -Wold-style-cast"Dmitriy Ivanov2015-03-061-1/+0
| | | |\ \ \ \ \
| | | | * | | | | Fix build: Remove -Wold-style-castDmitriy Ivanov2015-03-061-1/+0
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libz.h has macros using old-style-cast. Change-Id: I48f7d85805c7c34e1453c863da3c9e734a57d479
* | | | | | | | am 6c06c654: am cd9afa1c: am 4f0520fe: Merge "Revert "liblog: logprint use ↵Mark Salyzyn2015-03-081-5/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <endian.h>"" * commit '6c06c65437abee5c445c4a7d4a416b218f120a93': Revert "liblog: logprint use <endian.h>"
| * | | | | | | am cd9afa1c: am 4f0520fe: Merge "Revert "liblog: logprint use <endian.h>""Mark Salyzyn2015-03-081-5/+25
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd9afa1c27b70043a7bedabf1131d1e3c34d23e3': Revert "liblog: logprint use <endian.h>"
| | * | | | | | am 4f0520fe: Merge "Revert "liblog: logprint use <endian.h>""Mark Salyzyn2015-03-061-5/+25
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f0520fe6c12baebb0c3098a1bdb17b814b8fd02': Revert "liblog: logprint use <endian.h>"
| | | * | | | | Merge "Revert "liblog: logprint use <endian.h>""Mark Salyzyn2015-03-061-5/+25
| | | |\ \ \ \ \
| | | | * | | | | Revert "liblog: logprint use <endian.h>"Mark Salyzyn2015-03-061-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 66bfc5ccbda1c36923230b8dea36e86e8ac62d67. Bug: 19634248 Change-Id: I7c4851a247042193674f226fd0d5c5663e8074c7
* | | | | | | | | am eae3f0fe: am 80a37e9a: am 34671b81: Merge "Remove some gotos"Dmitriy Ivanov2015-03-081-13/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eae3f0febd1fb5e1b0b5f89826e8f13c6d6a67b0': Remove some gotos
| * | | | | | | | am 80a37e9a: am 34671b81: Merge "Remove some gotos"Dmitriy Ivanov2015-03-081-13/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80a37e9abd9a9fa7d262280a37195dc3e9ff50da': Remove some gotos
| | * | | | | | | am 34671b81: Merge "Remove some gotos"Dmitriy Ivanov2015-03-061-13/+8
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34671b8100131b5a4f07f4dceac53a007497bc52': Remove some gotos
| | | * | | | | | Merge "Remove some gotos"Dmitriy Ivanov2015-03-061-13/+8
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Remove some gotosDmitriy Ivanov2015-03-061-13/+8
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e162c8e0a700940f4302786b8523e5b2f5e5c27
* | | | | | | | am 12eb17b4: am 3ff6dd93: am 8b1a94c0: Merge "Cleanup old-style-cast warnings"Dmitriy Ivanov2015-03-082-23/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '12eb17b40be9247de8717a4edfb3619d6535e8c4': Cleanup old-style-cast warnings
| * | | | | | | am 3ff6dd93: am 8b1a94c0: Merge "Cleanup old-style-cast warnings"Dmitriy Ivanov2015-03-082-23/+28
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ff6dd938b33345c5be601dbc763cf7664cecec4': Cleanup old-style-cast warnings
| | * | | | | | am 8b1a94c0: Merge "Cleanup old-style-cast warnings"Dmitriy Ivanov2015-03-062-23/+28
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b1a94c07cb02a0398238ebaab4a2a0a23f7d28c': Cleanup old-style-cast warnings
| | | * | | | | Merge "Cleanup old-style-cast warnings"Dmitriy Ivanov2015-03-062-23/+28
| | | |\ \ \ \ \