aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am aeecac54: Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
|\ | | | | | | | | * commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e': Add missing includes.
| * Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
| |\
| | * Add missing includes.Elliott Hughes2015-01-2911-0/+12
| |/ | | | | | | Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
* | am dab56cac: Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
|\ \ | |/ | | | | | | * commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3': Add missing includes.
| * Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
| |\
| | * Add missing includes.Elliott Hughes2015-01-284-2/+6
| |/ | | | | | | Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
* | am eaeb55f7: Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
|\ \ | |/ | | | | | | * commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d': Start losing code to libadb.
| * Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
| |\
| | * Start losing code to libadb.Dan Albert2014-11-253-698/+1
| | | | | | | | | | | | | | | Bug: 17626262 Change-Id: I8ce7cff2b7789f39f35a4211d7120d072c05a863
* | | am cdc38d04: Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf': Fix the v2 descriptor handling.
| * | Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
| |\ \
| | * | Fix the v2 descriptor handling.Christopher Ferris2015-01-261-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a misinterpretation of how the v2 header works. The flags in the header indicate what is in the rest of the structure. Bug: 19127803 Change-Id: I83fd93df1df196300a80ddeb3b49ca7851ffcfb8
* | | | am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4': adbd: Support for new f_fs descriptor format
| * | | Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
| |\ \ \ | | |/ /
| | * | adbd: Support for new f_fs descriptor formatBadhri Jagan Sridharan2015-01-261-54/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch "[RFC] usb: gadget: f_fs: Add flags to descriptors block" marks the current usb_functionfs_descs_head format deprecated and introduces support for sending SuperSpeed descriptors. This CL makes adbd to send Descriptors in the new format. Adbd would fall back to the old format, if kernel is not able to recognize the new format. This is done to prevent adbd from breaking in the older versions of the kernel. Bug: 17394972 (cherry picked from commit b5b43043fa71f9cb620ddd02ec2bc98eced5a6ce) Change-Id: I5af9dc9d4f41ad47d678279054a648f69497b24e
* | | | am d4069928: Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd40699287fb659eca92b93dd325f82babcef77e6': Add missing <string.h> include.
| * | | Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Add missing <string.h> include.Elliott Hughes2015-01-241-0/+1
| | | | | | | | | | | | | | | | Change-Id: I79a9a58904b2992c306d8de0c7b3a4aacd4b67e0
* | | | am eade3a80: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eade3a800effe8f8fb89c8a2da12831bc5ba3239': Remove superfluous OpenSSL include paths.
| * | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | This include path was needed because system/vold/cryptfs.h included an OpenSSL header just to get the length of a SHA-256 hash. This has been fixed in https://android-review.googlesource.com/#/c/124477/1. Change-Id: I06a8ba0ee5b9efcc3260598f07d9819f065711de
* | | am 5bf74b23: Bump up max_map_count value.Jesse Zhao2015-01-151-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * commit '5bf74b238b402eaaf8c5bd1663fe4d592e59421f': Bump up max_map_count value.
| * | | Bump up max_map_count value.Jesse Zhao2015-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39 Bug: 18503789
* | | | am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'dd719dfe4eb1d8c15342ce05d2a0ab975c390d67': Use getmntent when accessing /proc/mounts.
| * | | Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
| |\ \ \
| | * | | Use getmntent when accessing /proc/mounts.Yabin Cui2015-01-021-75/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18887435 Change-Id: Ice44c14fc8ee79eab259caf486e123b6af21ceb0
* | | | | am a5d63956: Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a5d63956c419f01a9e57414c23d3ded3a16e0f8a': Remove an uninitialized value.
| * | | | Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove an uninitialized value.Dan Albert2014-12-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assignment of this value was removed in 0d32f25, but the declaration was still there and still tested. Clang issues a warning for this. Change-Id: I748bfb8b4f78ceed1c1b5b1bb80cb4e873e4facc
* | | | | am 538d7d83: Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-302-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '538d7d838d82e29c738145431aa64c587dc84943': Fix missing #includes in bootable/recovery.
| * | | | Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-292-2/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix missing #includes in bootable/recovery.Elliott Hughes2014-12-292-2/+4
| |/ / / | | | | | | | | | | | | Change-Id: I58dfbac6ca1aa80d3659f53a8fad1bbbbdc9b941
* | | | am a72512cd: Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a72512cd058da7de4cdb667776ed47fad873f12c': Add O_CREAT option for open
| * | | Add O_CREAT option for openSungmin Choi2014-12-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factory reset fails if there is no file, for example, RECOVERY_COMMAND_FILE_TMP. So create file as adding O_CREAT option if it does not exist. error log: --------- beginning of crash 12-10 02:35:17.190 3059 3059 F libc : Fatal signal 11 (SIGSEGV), code 1, fault addr 0x30 in tid 3059 (uncrypt) 12-10 02:35:17.296 766 1528 W NativeCrashListener: Couldn't find ProcessRecord for pid 3059 12-10 02:35:17.296 191 191 I DEBUG : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** 12-10 02:35:17.296 191 191 E DEBUG : AM write failure (32 / Broken pipe) 12-10 02:35:17.296 191 191 I DEBUG : Build fingerprint: 'Android/aosp_hammerhead/hammerhead:5.1/LMP/hopemini12052127:userdebug/test-keys' 12-10 02:35:17.296 191 191 I DEBUG : Revision: '10' 12-10 02:35:17.297 191 191 I DEBUG : ABI: 'arm' 12-10 02:35:17.297 191 191 I DEBUG : pid: 3059, tid: 3059, name: uncrypt >>> /system/bin/uncrypt <<< 12-10 02:35:17.297 191 191 I DEBUG : signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x30 12-10 02:35:17.302 191 191 I DEBUG : r0 00000001 r1 be94b690 r2 fffffe90 r3 b6fdbf7c 12-10 02:35:17.302 191 191 I DEBUG : r4 00000000 r5 00000000 r6 b6fd8ca4 r7 be94b67c 12-10 02:35:17.302 191 191 I DEBUG : r8 00000000 r9 ffffffff sl b6ff582b fp be94b68d 12-10 02:35:17.302 191 191 I DEBUG : ip b6fcfd08 sp be94b648 lr b6f98fe5 pc b6f98fe4 cpsr 20070030 12-10 02:35:17.303 191 191 I DEBUG : 12-10 02:35:17.303 191 191 I DEBUG : backtrace: 12-10 02:35:17.303 191 191 I DEBUG : #00 pc 00032fe4 /system/lib/libc.so (fputs+29) 12-10 02:35:17.303 191 191 I DEBUG : #01 pc 000016a1 /system/bin/uncrypt 12-10 02:35:17.303 191 191 I DEBUG : #02 pc 0000114b /system/bin/uncrypt 12-10 02:35:17.303 191 191 I DEBUG : #03 pc 00012df5 /system/lib/libc.so (__libc_init+44) 12-10 02:35:17.303 191 191 I DEBUG : #04 pc 000013cc /system/bin/uncrypt 12-10 02:35:17.325 191 191 I DEBUG : 12-10 02:35:17.325 191 191 I DEBUG : Tombstone written to: /data/tombstones/tombstone_00 Bug: 18709330 Change-Id: Ib5dccdd366e829049938a188ea5f98d9e4e282db
* | | | am f59b9942: Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f59b994264b2e8ffe179e2405cda81811f8a9db1': Add basic navigation controls to log viewer.
| * | | Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18642766 Change-Id: I95a6c8edf83513d421a041e79c15111b5c991dde Signed-off-by: Patrick Tjin <pattjin@google.com>
* | | | am cd055ee7: Save kernel logs to /cache/recoveryPatrick Tjin2014-12-101-6/+60
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cd055ee72a5efaf4bcbc0f81692410d3ffcda5e0': Save kernel logs to /cache/recovery
| * | | Save kernel logs to /cache/recoveryPatrick Tjin2014-12-101-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18642766 Change-Id: I6c8b7d8f9ffb688d3afdfe0d47c4142e711e421d Signed-off-by: Patrick Tjin <pattjin@google.com>
* | | | am 37ad1f12: Merge "Force write to disk while doing uncrypt" into lmp-mr1-devMichael Runge2014-12-101-5/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '37ad1f1273dd579b84317be6d1a9a27ad32af88c': Force write to disk while doing uncrypt
| * | | Merge "Force write to disk while doing uncrypt" into lmp-mr1-devMichael Runge2014-12-091-5/+10
| |\ \ \
| | * | | Force write to disk while doing uncryptMichael Runge2014-11-211-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should reduce errors if the device reboots before the blocks are commited to disk. Bug: 18481902 Change-Id: I13cda1c78955e4c83522fbcf87ddb16cc9f97683
* | | | | am c43b17f0: Merge "Fix recovery image build for 32p"Ying Wang2014-12-021-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'c43b17f0adac1092e221ce6166ca8bc464090525': Fix recovery image build for 32p
| * | | | Merge "Fix recovery image build for 32p"Ying Wang2014-12-011-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix recovery image build for 32pBruce Beare2014-11-301-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for 32p, we need to be explicit that we wish to build the 32bit version of the binaries that will be placed in the recovery image. The recovery image doesn't actually care... but if we are not explicit in this, the makefiles will ask for the 64bit binaries but the Android.mk for the binaries will supply the 32bit images (causing the build to fail). Change-Id: Iea2d5f412740c082795da4358765751138a4b167
* | | | am 5b9c4ce5: am b278c252: Add support for tune2fs file operationsMichael Runge2014-11-242-0/+43
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '5b9c4ce5a15bb76919e1556ae59993e9c310c0bc': Add support for tune2fs file operations
| * | | am b278c252: Add support for tune2fs file operationsMichael Runge2014-11-242-0/+43
| |\ \ \ | | |_|/ | |/| | | | | | | | | | * commit 'b278c252e148798346f85fc92eeea6afeb33fbf0': Add support for tune2fs file operations
| | * | Add support for tune2fs file operationsMichael Runge2014-11-212-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows tune2fs to be executed from within OTA scripts, allowing for file system modifications without formatting the partition Bug: 18430740 Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
* | | | am d34b6378: Merge "Global C++11 compatibility."Dan Albert2014-11-201-3/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit 'd34b63780eaf80ba71279360dc1e2fdbdc488eec': Global C++11 compatibility.
| * | | Merge "Global C++11 compatibility."Dan Albert2014-11-201-3/+4
| |\ \ \
| | * | | Global C++11 compatibility.Dan Albert2014-11-201-3/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our build system compiles flex/bison as C++ rather than C, but a few projects add `-x c` to their flags, forcing the compiler to compile them as C. This causes the compiler to reject the global C++ standard flag, so we need to explicitly provide a C standard flag to override it. Bug: 18466763 Change-Id: Id68ad9317261ed4d857a949b07288bd137ff6303
generated by cgit v1.1 at 2024-12-23 07:20:59 +0000