summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Introduce "adb keygen""Nick Kralevich2014-11-143-3/+34
|\
| * Introduce "adb keygen"Nick Kralevich2014-11-143-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the "adb keygen" command. Usage: adb keygen <filename> This command creates an adb public/private key pair in a user specified file. This can be used to create new adb keys, or rotate existing keys. Modify adb's key generation routines to use the HOSTNAME/LOGNAME environment variables if available. This allows someone to override the username/hostname embedded within the adb public key file if desired. Fallback to the old mechanisms if those environment variables aren't available. Bug: 18342715 Change-Id: Ibccee6088d4609aa05ad6687d3a1d8a8689d3e8a
* | am 514eefd5: am a46bf7eb: Merge "Convert futex to cond wait."Christopher Ferris2014-11-144-24/+56
|\ \ | | | | | | | | | | | | * commit '514eefd53c94b3bab67a92bc7bd859a083a918d3': Convert futex to cond wait.
| * \ am a46bf7eb: Merge "Convert futex to cond wait."Christopher Ferris2014-11-144-24/+56
| |\ \ | | | | | | | | | | | | | | | | * commit 'a46bf7eb686661bc8ace6c838e1e3004c993fb36': Convert futex to cond wait.
| | * \ Merge "Convert futex to cond wait."Christopher Ferris2014-11-144-24/+56
| | |\ \
| | | * | Convert futex to cond wait.Christopher Ferris2014-11-144-24/+56
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to the better supported pthread_cond to handle the Wait/Wake functions. Also, increase the number of simultaneous threads in the thread tests. Bug: 18381207 (cherry picked from commit db44538387b08f367fc2419653639866f4c2fbd6) Change-Id: Id326a7a7b92cb61573def3f761597c40f3ef2f4b
* | | | am 28d0d868: am 323df093: Merge "property_service: Added vendor build ↵Daniel Rosenberg2014-11-140-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | properties to load_all_props" into lmp-mr1-dev * commit '28d0d868a4f69e3507a36960c80562f2b8c0ca3e': property_service: Added vendor build properties to load_all_props
| * | | am 323df093: Merge "property_service: Added vendor build properties to ↵Daniel Rosenberg2014-11-140-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | load_all_props" into lmp-mr1-dev * commit '323df093c842e17b69d2be02462053697ef4d92e': property_service: Added vendor build properties to load_all_props
| | * \ \ Merge "property_service: Added vendor build properties to load_all_props" ↵Daniel Rosenberg2014-11-141-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | * | | property_service: Added vendor build properties to load_all_propsDaniel Rosenberg2014-11-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Rosenberg <drosen@google.com> (cherry picked from commit b95122205dba535215ff6b011ef8009933c55d3b) Bug: 18281574 Change-Id: Id1f1c4e9e0d1bfbcae3995fb7966d18bf7d6e06d
* | | | | | am de5fdd67: am 6ef68b55: Merge "System/core: Use memmove"Andreas Gampe2014-11-141-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'de5fdd67730def6d3002ae56b27bb349e2ad4d24': System/core: Use memmove
| * | | | | am 6ef68b55: Merge "System/core: Use memmove"Andreas Gampe2014-11-141-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '6ef68b55b77b199fdcef2822750a392e1d0a4b04': System/core: Use memmove
| | * | | | Merge "System/core: Use memmove"Andreas Gampe2014-11-141-1/+1
| | |\ \ \ \
| | | * | | | System/core: Use memmoveAndreas Gampe2014-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should use memmove when you expect overlap. Change-Id: I268a173db40a4be54232958e37aa8a03c2a885ee
* | | | | | | am 0b7f3684: am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use ↵Hans Boehm2014-11-149-1040/+120
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stdatomic.h."" * commit '0b7f368442853f0eac86addd0f9cd186ac51262e': Second attempt to "Rewrite atomic.h to use stdatomic.h."
| * | | | | | am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-11-149-1040/+120
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '64d7117efc7f7b8b477cd216a119b07041d8f406': Second attempt to "Rewrite atomic.h to use stdatomic.h."
| | * | | | | Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-11-149-1040/+120
| | |\ \ \ \ \
| | | * | | | | Second attempt to "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-11-139-1040/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should not be committed until win_sdk and aarch64 builds are fixed in the presence of this CL. This reverts commit 2789faabfa9cdf16902a52a1de3fc4a7ae98efed. We additionally remove uniprocessor support from the earlier CL, thus avoiding a potential compiler code reordering issue. Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
* | | | | | | | am 99184bab: (-s ours) am 72f0d92c: DO NOT MERGE: Do not mount devices with ↵Sami Tolvanen2014-11-140-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalid verity metadata * commit '99184bab35c0b88dfc70c8be1d88cfb100dbf4cd': DO NOT MERGE: Do not mount devices with invalid verity metadata
| * | | | | | | am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-141-1/+3
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '72f0d92c722447e0c87cfe765516a7352db3d51a': DO NOT MERGE: Do not mount devices with invalid verity metadata
| | * | | | | | DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The return value of read_verity_metadata is propagated to caller even if the verity metadata is invalid, provided that it can be read from the device. This results in devices with invalid verity metadata signatures to be mounted normally, which is not desirable. This change fixes the bug by changing the return value in case of verification failure to FS_MGR_SETUP_VERITY_FAIL. Bug: 15984840 Bug: 18120110 Change-Id: Ic29f37a23cb417c2538d60fb05de9dd310d50f4a (cherry picked from commit c95e9da39660f278ace4b14d688dc6818d1a38bf)
* | | | | | | | am 2dfadac1: (-s ours) am 9573a13b: DO NOT MERGE: Switch fs_mgr to use ↵Sami Tolvanen2014-11-140-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SHA-256 instead of SHA-1 * commit '2dfadac1569126d72b2da42233afc908b7ec10a7': DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1
| * | | | | | | am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-141-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '9573a13bbc015c555adff1e4e0fbef2a18963111': DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1
| | * | | | | | DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-131-3/+3
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verity metadata signatures will be switched to SHA-256. Switch fs_mgr signature verification to use the correct algorithm. Needs matching changes from https://googleplex-android-review.git.corp.google.com/#/c/579905/ https://googleplex-android-review.git.corp.google.com/#/c/583213/ https://googleplex-android-review.git.corp.google.com/#/c/583214/ https://googleplex-android-review.git.corp.google.com/#/c/583233/ Bug: 15984840 Bug: 18120110 Bug: 17917515 Change-Id: I8f90519bffa105a0eb7abeaad3aea1ffceb851e2 (cherry picked from commit a3465e250cfc3c00931735711e11ad61cf84d8b2)
* | | | | | | am 509f1c9a: am 165238d8: Merge "Fix a trivial typo."Chih-Hung Hsieh2014-11-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '509f1c9aeee4fb2c5dd97bb4deeedcf8de0da900': Fix a trivial typo.
| * | | | | | am 165238d8: Merge "Fix a trivial typo."Chih-Hung Hsieh2014-11-131-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '165238d8deb41a10f909a61bfb7542c306594b69': Fix a trivial typo.
| | * | | | | Merge "Fix a trivial typo."Chih-Hung Hsieh2014-11-131-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix a trivial typo.Chih-Hung Hsieh2014-11-131-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang compiler gave a correct warning on this mismatch of names in #ifndef and #define. Change-Id: I360f0c40ee98162093dde8f9815a02a54e5b2cb7
* | | | | | | am 30db2d25: am c9582d02: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-143-20/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '30db2d259369efccde665ac15cc5930a540fac58': kill HAVE_FORKEXEC
| * | | | | | am c9582d02: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c9582d02391393d38b511f8c58be5429bdcb0406': kill HAVE_FORKEXEC
| | * | | | | Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
| | |\ \ \ \ \
| | | * | | | | kill HAVE_FORKEXECYabin Cui2014-11-123-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18317407 Change-Id: I4eecb3c9d745e3dabfc46fa595aac7f94f6d93e3
* | | | | | | | am d56c92b7: am a3f16f22: Merge "Add LOCAL_MULTILIB := both to Darwin ↵Dan Albert2014-11-141-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libbacktrace." * commit 'd56c92b7201c23116ed3845f78cbb80e1b3fa530': Add LOCAL_MULTILIB := both to Darwin libbacktrace.
| * | | | | | | am a3f16f22: Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace."Dan Albert2014-11-131-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3f16f22dc9f68ae0a204cfb9159270a3291231f': Add LOCAL_MULTILIB := both to Darwin libbacktrace.
| | * | | | | | Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace."Dan Albert2014-11-131-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | Add LOCAL_MULTILIB := both to Darwin libbacktrace.Dan Albert2014-11-131-0/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously set for libbacktrace_libc++, but apparently never was for libbacktrace. Change-Id: I85dc44b356710c6367f5cea3bc0a4d6c817ca202
* | | | | | | | am 8822a81d: am a78e1a74: Merge "Sdcard: Initialize the padding output value"Elliott Hughes2014-11-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8822a81defc3224c11e44719baf5574202142a05': Sdcard: Initialize the padding output value
| * | | | | | | am a78e1a74: Merge "Sdcard: Initialize the padding output value"Elliott Hughes2014-11-131-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a78e1a741810bbeaea955f30e6b5b8aa6b4b3a6b': Sdcard: Initialize the padding output value
| | * | | | | | Merge "Sdcard: Initialize the padding output value"Elliott Hughes2014-11-131-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | Sdcard: Initialize the padding output valueDaisuke Okitsu2014-11-131-0/+1
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add initialization of the output value in handle_write. This value is referred to in FUSE so initialization is necessary. See also handle_open and handle_opendir. Change-Id: I6507f113da9f6823fbfa459624d6594fc20afa51
* | | | | | | | am 5a8a0162: am 8f7fc8df: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-143-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a8a016287db75c9599bc0b95a925364c6000025': kill HAVE_LOCALTIME_R
| * | | | | | | am 8f7fc8df: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-133-6/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f7fc8dfed9ab6615e4a906aaefdf0eadd31ea28': kill HAVE_LOCALTIME_R
| | * | | | | | Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-133-6/+6
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | kill HAVE_LOCALTIME_RYabin Cui2014-11-133-6/+6
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18361583 Change-Id: Icdc745a5204bba26c6438d16ed38ec791e136163
* | | | | | | am d707b7f9: am b0a10b53: Merge "Fix segfault in ↵JP Abgrall2014-11-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_character_device_symlinks()" * commit 'd707b7f99357b521e01c0b11489a3b17b04a2a2d': Fix segfault in get_character_device_symlinks()
| * | | | | | am b0a10b53: Merge "Fix segfault in get_character_device_symlinks()"JP Abgrall2014-11-131-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b0a10b53eeeef6428bd034e3097391e9a7a4788b': Fix segfault in get_character_device_symlinks()
| | * | | | | Merge "Fix segfault in get_character_device_symlinks()"JP Abgrall2014-11-131-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix segfault in get_character_device_symlinks()Tomasz Kondel2014-11-131-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A segmentation fault will occur when strchr function returns NULL. Change-Id: I76076acfff16056179bf24dff5df9f81d9a45125
* | | | | | | am 755b9099: am c325535d: Merge "Close fd on error path in do_mount()"JP Abgrall2014-11-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '755b9099203fd1b491bf82dc8dad5bafba4f6bcd': Close fd on error path in do_mount()
| * | | | | | am c325535d: Merge "Close fd on error path in do_mount()"JP Abgrall2014-11-131-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c325535d3de1d103d5d40c5267df9ff9325bb3e3': Close fd on error path in do_mount()
generated by cgit v1.1 at 2025-01-26 09:00:56 +0000