summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 91cb2cb3: Merge "toolbox: indicate why swap{on|off} failed"Elliott Hughes2014-11-182-2/+2
|\ | | | | | | | | * commit '91cb2cb3411472a567c8ec4e8dad9d3a1ebc1dca': toolbox: indicate why swap{on|off} failed
| * Merge "toolbox: indicate why swap{on|off} failed"Elliott Hughes2014-11-182-2/+2
| |\
| | * toolbox: indicate why swap{on|off} failedAndrew Boie2014-04-302-2/+2
| | | | | | | | | | | | | | | Change-Id: I1247e3592ab0f9878fb27d114fd14f9b29282b0e Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | am 6a56ad28: Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
|\ \ \ | |/ / | | | | | | | | | * commit '6a56ad28c385ad799f25a1b90213b2367fcb9e22': kill HAVE_TERMIO_H
| * | Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
| |\ \
| | * | kill HAVE_TERMIO_HYabin Cui2014-11-171-12/+17
| | | | | | | | | | | | | | | | | | | | Bug: 18398307 Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
* | | | am ac252357: Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715': Remove atomic-inline.h.
| * | | Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
| |\ \ \ | | |/ / | |/| |
| | * | Remove atomic-inline.h.Elliott Hughes2014-11-173-21/+2
| |/ / | | | | | | | | | Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
* | | am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."Elliott Hughes2014-11-173-18/+2
|\ \ \ | |/ / | | | | | | | | | * commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669': Remove the error-prone TARGET_CPU_SMP from system/core.
| * | Merge "Remove the error-prone TARGET_CPU_SMP from system/core."Elliott Hughes2014-11-173-18/+2
| |\ \
| | * | Remove the error-prone TARGET_CPU_SMP from system/core.Elliott Hughes2014-11-173-18/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | This means that code that uses libcutils no longer has to ensure that it's set ANDROID_SMP in the calling code's Android.mk for this to function correctly. Change-Id: I80c7ff170cd621106f34d6b74689d6b4f03e4eb7
* | | Introduce "adb keygen"Nick Kralevich2014-11-173-3/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 86c9e5f * commit '86c9e5f7e20a3f1712038ce642628c2e1e866434': Introduce "adb keygen"
| * | | 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 (cherry picked from commit af782b9f2ac4fb817ded80d4317a45345bb3f992) Change-Id: Ic76ffc9412171dddc879af0bbf6e20fbe1a8f057
* | | | am e11d81b3: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-171-5/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'e11d81b37c119ec3d67c1fe60779d510d21e6a14': Update calls to IInterface::asBinder()
| * | | Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-171-5/+5
| |\ \ \
| | * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
* | | | am e90159b0: Merge "Move debuggerd to libc++."Dan Albert2014-11-161-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e90159b070a773fa33fdbb2aaf2f84ac0189f699': Move debuggerd to libc++.
| * | | Merge "Move debuggerd to libc++."Dan Albert2014-11-161-2/+0
| |\ \ \
| | * | | Move debuggerd to libc++.Dan Albert2014-11-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: I935a08e98077b688d1735fb5b84a615cb7df8810
* | | | | am 917d6f4c: Merge "Move libutils to libc++."Dan Albert2014-11-161-4/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '917d6f4c73f7856adf4f369a675aeccfe42d746b': Move libutils to libc++.
| * | | | Merge "Move libutils to libc++."Dan Albert2014-11-161-4/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Move libutils to libc++.Dan Albert2014-11-151-4/+0
| |/ / / | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: I85aff3bcabb5ee3c8be9918b7bef0fd1bbfa98e3
* | | | am 133b7d4a: Merge "Don\'t manually link libgtest_main in libion tests."Dan Albert2014-11-141-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '133b7d4a84e6fd257bc1365b623415d41d8ebe2f': Don't manually link libgtest_main in libion tests.
| * | | Merge "Don't manually link libgtest_main in libion tests."Dan Albert2014-11-141-1/+0
| |\ \ \
| | * | | Don't manually link libgtest_main in libion tests.Dan Albert2014-11-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is actually probably broken right now, since these tests are getting both the libc++ flavor and stlport flavor of libgtest_main. Bug: 15193147 Change-Id: Ic2f8dda98240c12591803f3c3522505314a05609
* | | | | am 29a34a5e: Merge "Disable the static libcutils tests."Dan Albert2014-11-141-15/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '29a34a5e7c249046a995a140ba30fa10960c7d42': Disable the static libcutils tests.
| * | | | Merge "Disable the static libcutils tests."Dan Albert2014-11-141-15/+17
| |\ \ \ \
| | * | | | Disable the static libcutils tests.Dan Albert2014-11-141-15/+17
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static libcutils tests cannot be built when using libc++ because there are multiple symbol definition errors between libc++ and libgcc. Bug: 18389856 Change-Id: I6f41c561f97b3a37477f844e9abf6551524a0fa3
* | | | | resolve merge conflicts of bc137cf to lmp-mr1-dev-plus-aosp.Christopher Ferris2014-11-140-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I9b542a0b1a2ae52c954b6b6995e6836c0c6713d3
| * | | | Merge "Convert futex to cond wait." into lmp-mr1-devChristopher Ferris2014-11-144-24/+60
| |\ \ \ \
| | * | | | Convert futex to cond wait.Christopher Ferris2014-11-134-24/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I63240208e8b7f641b3f35a3fc0bb1acf80dc796e
* | | | | | 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 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 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 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 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 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 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
| |\ \ \ \ \
generated by cgit v1.1 at 2024-07-17 16:17:25 +0000