summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Make encryption configurable"Paul Lawrence2015-02-064-8/+4
| | | | | | | | | | | | | | | This reverts commit bda6272446454886339841a62daaa1b66c07ad60. The original fix seems to have led to boot failures in QA. Rather than risk shipping, revert the change. Bug 18764230 reopened. Requires change https://googleplex-android-review.git.corp.google.com/#/c/629764/ Bug: 19278390 Bug: 19199624 Change-Id: I8b6ab585666f2b0f585ffb2a5f61ac2e3462e06e
* Make encryption configurablePaul Lawrence2015-01-214-4/+8
| | | | | | | | | | | Delay mounting encryptable but unencrypted volumes until we can check the ro.vold.forceencrypt flag, then optionally encrypt. Requires matching vold change from https://googleplex-android-review.git.corp.google.com/#/c/615309/ Bug: 18764230 Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
* Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-devDmitry Shmidt2015-01-151-1/+0
|\
| * android_filesystem: Remove setuid bits from tcpdumpDmitry Shmidt2015-01-151-1/+0
| | | | | | | | | | | | | | Bug: 18669116 Change-Id: I25486f2fe0e994f569b788fc9f03ef6d383f54d4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Merge "Remove explict use of ASCII encoding" into lmp-mr1-devJean-Michel Trivi2015-01-152-2/+2
|\ \
| * | Remove explict use of ASCII encodingAl Sutton2015-01-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the use of CFStringGetCString with kCFStringEncodingASCII specified with CFStringGetFileSystemRepresentation which will ensure the correct character encoding is used to conver the CFString into a NULL terminated char array suitable for use with POSIX APIs. (cherry picked from commit 2a4b5f9e804f019c0d565c86579f07963989ed1b) Change-Id: Ie6e2027e59b49ca634c7308bcda7bb492d372f46
* | | Merge "Return path including executable instead of without" into lmp-mr1-devJean-Michel Trivi2015-01-152-10/+10
|\ \ \ | |/ /
| * | Return path including executable instead of withoutAl Sutton2015-01-142-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation returned the path the executable was in instead of returning the path including the executable (i.e. it returned ...bin instead of ...bin/executable). This is not what the original methods did and caused the process forking of adb to fail. This patch corrects the implementation. (cherry picked from commit 26b53bb75e6bdf9aa7820a3343845dae145625cc) Change-Id: Icad6870bbb0a88f611ca71d90fff30f7b576c367
* | | Merge "Fix building on modern versions of Xcode and OS X." into lmp-mr1-devJean-Michel Trivi2015-01-152-15/+16
|\ \ \ | |/ /
| * | Fix building on modern versions of Xcode and OS X.Al Sutton2015-01-142-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent versions of XCode fail to compile the adb and fastboot binaries due to two functions being deprecated in 10.9 (GetCurrentProcess and ProcessInformationCopyDictionary), and the use of -Werrror. This patch replaces the method implementations which use calls to methods deprecated in the 10.9 SDK with versions which only call non-deprecated methods. (cherry picked from commit f456d47c506d87265ce0ff6080cba5374dced011) Change-Id: Ibd80dda73ccdd7c561b50b4065581e645d9855d6
* | | Merge "sdcard : inode numbers must be fully representable as uint32_t." into ↵Narayan Kamath2015-01-151-1/+34
|\ \ \ | | | | | | | | | | | | lmp-mr1-dev
| * | | sdcard : inode numbers must be fully representable as uint32_t.Narayan Kamath2015-01-141-1/+34
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This works around a bug on on 64 bit kernels + sdcard daemons where we were using memory addresses as inode numbers. bug: 19012244 Change-Id: Ia63c5b33b4212bf03ff92fa2faff0bb76e48791c
* | | Add timed versions of stack dumping functions.Christopher Ferris2015-01-142-3/+44
|/ / | | | | | | | | | | | | | | | | | | Under some unknown circumstances, debuggerd could become unresponsive. If you try and take a bugreport during this time, it will hang forever. Adding functions that have a timeout will allow dumpstate to stop if dumping is taking too long. Bug: 18766581 Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
* | Merge "Provide a way to select force encryption from vendor partition" into ↵Leo Wang2015-01-091-1/+12
|\ \ | | | | | | | | | lmp-mr1-dev
| * | Provide a way to select force encryption from vendor partitionPaul Lawrence2015-01-071-1/+12
| |/ | | | | | | | | | | | | | | | | | | This allows a vendor to force encryption on devices via a vendor partition flag: ro.vold.forceencryption 1 Bug: 18764230 Change-Id: Id0049ce64e34e4f6f96e593aadd70c277ac131c8
* | init: Fix memory corruption when sanitizing platform pathsChristopher R. Palmer2015-01-071-2/+2
|/ | | | | | | | | | | | | This commit fixes code that incorrectly increments s when it hits the terminator character of the string being sanitized. This means it will randomly start trashing memory beyond the end of the string being sanitized until it happens to hit two NULs (\0\0) which will break it out of the loop. (cherry picked from commit 07f3fee164bd7ba14ce9b2dd3818006f07162845) Bug: 18885357 Change-Id: If6b01fe2b9bd5985f08f1278deb03b311d0170dc
* audio: add usage "virtual source" to audio attributes.Eric Laurent2014-12-091-0/+1
| | | | | Bug: 16006090. Change-Id: I2d22b52e97095b57a6508b82bd11e27f860bb2e7
* audio: new stream typesEric Laurent2014-11-241-4/+8
| | | | | | | | Added stream types for internal use by audio policy and audio flinger. Bug: 18067208. Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
* sdcard: mount sdcard with the noexec optionDaisuke Okitsu2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | Vold mounts the sdcard with noexec, but the fuse deamon mounts with exec, so it is still possible to execute binaries: /dev/fuse /storage/sdcard1 fuse rw,nosuid,nodev,relatime, user_id=1023,group_id=1023,default_permissions,allow_other 0 0 /dev/block/vold/179:65 /mnt/media_rw/sdcard1 vfat rw,dirsync, nosuid,nodev,noexec,relatime,uid=1023,gid=1023,fmask=0007, dmask=0007,allow_utime=0020,codepage=cp437,iocharset=iso8859-1, shortname=mixed,utf8,errors=remount-ro 0 0 With this change both vold and fuse mounts with noexec. (cherry picked from commit f777d6694eecf6e61d9859df2090199863050017) Change-Id: I66cbfc3a3a89a26958f83577f5e7a5e27f99184e
* logd: throttle SELinux denials to 20/secNick Kralevich2014-11-193-22/+13
| | | | | | | | | | | | | | Impose a limit of 20 selinux denials per second. Denials beyond that point don't add any value, and have the potential to cause crashes or denial of service attacks. Do some other misc cleanup while I'm here. Bug: 18341932 (cherry picked from commit c234a1b879d9c9d8e1a797c5dcf3098249945748) Change-Id: Ic5c96003db82e504baf301e87be5c8c539c73c2a
* 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
* 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
* | 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
* | 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)
* | 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)
* fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-081-1/+2
| | | | | | | | | | The newer fsck.f2fs (1.4.0++) has better fix support, so invoke it. Requires http://ag/583949 f2fs-tools update. Bug: 17640053 Bug: 18292088 Change-Id: I42370d92b232e0bdbf28cccf7035a15dbffeb268 Signed-off-by: JP Abgrall <jpa@google.com>
* Fix adb/fastboot windows compilations.Christopher Ferris2014-11-065-2/+11
| | | | | | | | | | Many of the windows files where not including stdlib.h even though they are using malloc/free calls. Bug: 18283958 (cherry picked from commit ae7bf0959bd3f79afbf365e41f015ed1c304afdc) Change-Id: Iebc09cc314fa8f0ba6c6cd45ba26135052f156dd
* Ensure /data/adb existsNick Kralevich2014-11-051-0/+2
|\ | | | | | | | | | | | | automerge: 6672300 * commit '667230074b6e4e306a50d84a88a57bf4f1ec0291': Ensure /data/adb exists
| * Ensure /data/adb existsNick Kralevich2014-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Ensure that /data/adb always exists. This directory is used for writing adb debugging information when persist.adb.trace_mask is set. Bug: https://code.google.com/p/android/issues/detail?id=72895 (cherry picked from commit 89252ce31aacb27248e708b6487f730d3a024943) Change-Id: I44e01bee50125f4e6e5fff6e74c53bb2022ce355
* | Merge "Fix native_handle_create to check if malloc fails" into lmp-mr1-devMichael Lentine2014-11-031-3/+5
|\ \
| * | Fix native_handle_create to check if malloc failsMichael Lentine2014-11-031-3/+5
| | | | | | | | | | | | | | | Bug: 18076253 Change-Id: I8dbe3af88f52f18f74a3ab857fea53ae7585e2f7
* | | am 4b970895: am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. ↵Christopher Ferris2014-11-030-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | automerge: 5a69c1d -s ours automerge: d7c8db1 -s ours * commit '4b970895848ff114ac1011a293663eb6d43e8fd7':
| * | am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d ↵Christopher Ferris2014-11-030-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | -s ours automerge: d7c8db1 -s ours * commit '5bd963117aa121d1fdfd5def4379cd363cf60ece':
| | * \ DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s oursChristopher Ferris2014-11-030-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d7c8db1 -s ours * commit 'd7c8db124c1b4b13d7f55f7c338913ec6d0cd3d1':
| | | * \ DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-240-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 5a69c1d -s ours * commit '5a69c1db365323f984c6a8afd1fc035551e96d99': DO NOT MERGE Restore libcorkscrew unwinding.
* | | | \ \ am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to ↵Christopher Ferris2014-11-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp. automerge: e916313 * commit 'a18bcfa45e9d37650bca158577d02f5059453935':
| * | | | | am 91ce3576: resolve merge conflicts of 290efd2 to ↵Christopher Ferris2014-11-030-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp. automerge: e916313 * commit '91ce3576337b0541912da7ec4b1efd802568dfce':
| | * | | | resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.Christopher Ferris2014-11-030-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | automerge: e916313 * commit 'e916313defbd09479dc29d38f3aa467f3b296f7c':
| | | * | | resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.Christopher Ferris2014-10-240-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6b18eeae43c2ef2256a0508ac60c1724385d3b0
* | | | \ \ \ Merge "Fix debuggerd issues." into lmp-mr1-devChristopher Ferris2014-11-035-63/+56
|\ \ \ \ \ \ \
| * | | | | | | Fix debuggerd issues.Christopher Ferris2014-11-025-63/+56
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix a problem where a tid exits before the attach completes, and it causes debuggerd to self terminate. - Fix a problem where sibling tid dumps do not properly wait for the tid to get signalled. Bug: 17800180 Bug: 12567315 Change-Id: Ic3cd619cc2c72402f9a45f14abeed4721b50d64d
* | | | | | | Fix mac buildNick Kralevich2014-11-032-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "errno.h" doesn't get included on mac so we need to do it explicitely. system/core/libnativebridge/tests/CodeCacheExists_test.cpp:30:15: error: use of undeclared identifier 'ENOENT' ASSERT_EQ(ENOENT, errno); (cherry picked from commit bcd1a834d4a979ae650ac8677b0647cfb3ec4766) Change-Id: Ib894e3a3912a943c61787461f127e4b11aacf212
* | | | | | Fix verity on system partitions larger than 2GSami Tolvanen2014-10-291-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the system partition is larger than 2G, the device fails to read verity metadata, because fseek accepts only a 32-bit signed offset. Switch from fseek to lseek64 to allow seeking using a 64-bit offset, which solves the problem. At the same time, move away from stdio in the function. Bug: 17705619 Change-Id: I226320498dcb750ec6cde84411c7fe0774c9cab7
* | | | | | Merge "Add code cache tests to libnativebridge." into lmp-mr1-devCalin Juravle2014-10-285-1/+112
|\ \ \ \ \ \
| * | | | | | Add code cache tests to libnativebridge.Calin Juravle2014-10-285-1/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18027433 (cherry picked from commit 59a719c466d33479265a3e9c204c8dc9a8f435f1) Change-Id: I32bcf3ae0d4569d4d8b88168e6c36ddff70b8f7d
* | | | | | | Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-devCalin Juravle2014-10-2811-47/+313
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-2711-47/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - add kPreInitiliazed state to native bridge with check transition: kOpened->kPreInitialized->kInitialized - made sure we free the memory for the code_cache_path - tidy up some error messages - tidy up tests - add a dummy native bridge to test with Bug: 18027433 Bug: 18097480 (cherry picked from commit f9d9e2a2d96559c3165405d572b08e260156074a) Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
* | | | | | | Merge "adb warns on remount when verity is enabled" into lmp-mr1-devPaul Lawrence2014-10-271-1/+33
|\ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-24 18:30:01 +0000