summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Call markBootAttempt when serice manager availableDaniel Rosenberg2018-10-151-0/+2
| | | | | | | | | | This causes adds a call the fucntion to decrement the checkpoint's retry count as soon as service manager is available. Test: vdc setCheckpoint 2 then reboot 3 times checking state Bug: 112901762 Change-Id: Ie0a78b1eb05b340718e76175509d1ebefae68017
* Merge "init: add [[nodiscard]] to Result"Tom Cherry2018-10-116-9/+25
|\
| * init: add [[nodiscard]] to ResultTom Cherry2018-10-116-9/+25
| | | | | | | | | | | | | | | | | | It's better to either check these results or explicitly ignore them. Only a few callers weren't already doing this, so it's relatively trivial to enforce. Test: build Change-Id: I44cdc342e46128f66cac914aaa0b9b4559cacd8c
* | Merge changes from topic "windows-libcxx"Pirama Arumuga Nainar2018-10-1114-79/+24
|\ \ | | | | | | | | | | | | | | | | | | * changes: Do not enable -Wold-style-cast for Windows Add sys/types.h in utf8.h Adapt to switch to libc++ for Windows
| * | Do not enable -Wold-style-cast for WindowsPirama Arumuga Nainar2018-09-261-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/91353691 Enable -Wold-style-cast only for non-Windows targets. _islower_l, _isupper_l etc. in MinGW locale_win32.h (included from libcxx/include/__locale) have an old-style-cast. Test: Build and test Windows modules under Wine. Change-Id: Ib7594559a43096885b0cc1c656cf59db8b52d38b
| * | Add sys/types.h in utf8.hPirama Arumuga Nainar2018-09-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/91353691 It's needed for mode_t. Test: Build and test Windows modules under Wine. Change-Id: I3fa6b2946316a9bd2a0d800ae928ba5de480a283
| * | Adapt to switch to libc++ for WindowsPirama Arumuga Nainar2018-09-2112-78/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/91353691 - libcxx has ETXTBSY for Windows - adb/sysdeps/memory.h is no longer needed Test: Build and test Windows binaries under Wine. Change-Id: I9c27087d46c49cb25b391c4adae8d9e24724784d
* | | Merge "fs_mgr: deprecate check for ro.build.system_root_image"Treehugger Robot2018-10-112-26/+5
|\ \ \
| * | | fs_mgr: deprecate check for ro.build.system_root_imageMark Salyzyn2018-10-102-26/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a "/" in the fstab, can only be there on system as root. This drops the troubling and annoying log message: [libfs_mgr]Could not find verity device for mount point: /: No such device or address Test: manual Bug: 109821005 Change-Id: I6bbfc0af63e1526e52a1c6365241dbc1d5ee7c6a
* | | | Merge "Reverted aapt dependency to be a dependency on libandroidfw"Idries Hamadi2018-10-115-143/+135
|\ \ \ \
| * | | | Reverted aapt dependency to be a dependency on libandroidfwIdries Hamadi2018-10-055-143/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed call to external aapt2 process Replaced several layers of error handling with calls to fatal() Changed output messages for failures to be more useful for diagnostics Bug: 116753196 Test: mm Test: adb install -r --fastdeploy --force-agent --local-agent ~/example_apks/example.apk Test: adb install -r --fastdeploy --no-streaming --force-agent --local-agent ~/example_apks/example.apk Change-Id: I6006d8aa584e789a086a31e79a41d1416e54402a
* | | | | Merge "Suppress implicit-fallthrough warning."Treehugger Robot2018-10-111-0/+1
|\ \ \ \ \
| * | | | | Suppress implicit-fallthrough warning.Chih-Hung Hsieh2018-10-101-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 112564944 Test: make checkbuild Change-Id: I2bcfd08ec62f6d5953a9e25dbeaa42ffefda6d1c
* | | | | Merge "Read memory stats from /proc/pid/stat file."Rajeev Kumar2018-10-102-11/+51
|\ \ \ \ \
| * | | | | Read memory stats from /proc/pid/stat file.Rajeev Kumar2018-10-102-11/+51
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 0301683e49ab255769b15469487feaab3466167a) Bug: 117333340 Test: Manual testing using alloc-stress tool Merged-In: Ie555933aafa6a6b7aa1dbf5518ebe804376e0afd Change-Id: Ie555933aafa6a6b7aa1dbf5518ebe804376e0afd
* | | | | Merge "Do not calculate CRC for sparse images during fastboot flash"Treehugger Robot2018-10-101-1/+1
|\ \ \ \ \
| * | | | | Do not calculate CRC for sparse images during fastboot flashHridya Valsaraju2018-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 78793464 Test: fastboot flashall Sparse images with CRC are not supported by the Android build system and hence the calculated CRC is unused. Change-Id: Ia48b2f7e29f2adea26d185c5a8f2337c4cbe6dcb
* | | | | | Merge "set_active command should update current slot information."Treehugger Robot2018-10-103-2/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | set_active command should update current slot information.Hridya Valsaraju2018-10-103-2/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Boot control HAL implementations will return the current boot slot as the active slot. If a set_active command is issued on another slot, it should be considered as the new active slot and subsequent flashes should flash the same. Test: fastboot set_active "b", fastboot getvar current-slot Bug: 78793464 Change-Id: Ida3817670de8e74a7d7ae2a905e7ac1756c6bdf1
* | | | | Merge changes I5e3f6677,I94665a41Treehugger Robot2018-10-103-39/+290
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: fs_mgr: overlayfs create scratch using a Dynamic Logical Partition fs_mgr.h cleanup
| * | | | | fs_mgr: overlayfs create scratch using a Dynamic Logical PartitionMark Salyzyn2018-10-101-25/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default is a valid /mnt/scratch/overlay/ or /cache/overlay/ directory, with .../<mount_point>/upper and .../<mount_point>/work, associated with each system partition <mount_point>. Add support for Dynamically Resized Partitions to create /mnt/scratch. Test: manual Bug: 109821005 Change-Id: I5e3f66778ea9e937c839e25541fedb6fbf34ab50
| * | | | | fs_mgr.h cleanupMark Salyzyn2018-10-102-14/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop struct from specifications, fix style. Test: compile Change-Id: I94665a41d514501d2f4cd6888361316e08813431
* | | | | Merge "adb: don't close sockets before hitting EOF."Josh Gao2018-10-103-4/+211
|\ \ \ \ \
| * | | | | adb: don't close sockets before hitting EOF.Josh Gao2018-10-043-4/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The standard (RFC 1122 - 4.2.2.13) says that if we call close on a socket while we have pending data, a TCP RST should be sent to the other end to notify it that we didn't read all of its data. However, this can result in data that we've succesfully written out to be dropped on the other end. To avoid this, instead of immediately closing a socket, call shutdown on it instead, and then read from the file descriptor until we hit EOF or an error before closing. Bug: http://b/74616284 Test: ./test_adb.py Test: ./test_device.py Change-Id: I36f72bd14965821dc23de82774b0806b2db24f13
* | | | | | Merge "fs_mgr: overlayfs deal with verity detection issues"Treehugger Robot2018-10-101-17/+43
|\ \ \ \ \ \
| * | | | | | fs_mgr: overlayfs deal with verity detection issuesMark Salyzyn2018-10-101-17/+43
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop checking verity on each entry in the fstab, collect the verity list whole and use in the loop. Open code verity detection for "system" for cases where device table is incompletely specified, does not specify a "/" or a "/system" entry. Test: manual, /system on system-as-root overlays correctly. Bug: 109821005 Change-Id: I7bc5fbef6577bb0823cb5deb26c370219e4e597b
* | | | | | Merge "Fix handling of globals for new linker."Christopher Ferris2018-10-104-17/+16
|\ \ \ \ \ \
| * | | | | | Fix handling of globals for new linker.Christopher Ferris2018-10-084-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new linker base map is read-only, but the global handling code for jit and dex information assumed the base map was a read-execute one. Relax that requirement to search read-only maps. Adjust the unit tests for this case. Bug: 117293117 Test: Passes unit tests. Test: Passes art cfi tests with and without llvm linker. Change-Id: I31a765d51847d0b8d778ace9cbaa29f42073f4d9
* | | | | | | Merge "Handle retry count correctly"Treehugger Robot2018-10-102-62/+112
|\ \ \ \ \ \ \
| * | | | | | | Handle retry count correctlyPaul Lawrence2018-10-082-62/+112
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: vdc startCheckpoint 2 then reboot 3 times checking state Change-Id: I4eeda7f73d82a7c8b2469571fa558df2fac47354
* | | | | | | Merge "Check validity of partition for getvar:partition-type"Treehugger Robot2018-10-091-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Check validity of partition for getvar:partition-typeHridya Valsaraju2018-10-091-0/+7
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: fastboot getvar partition-type:product_services_a Bug: 79480454 Change-Id: I4020b0c94daf8fb86c29104aecc1eb8f44f89999
* | | | | | | Merge "Return partition size in hex format."Treehugger Robot2018-10-092-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Return partition size in hex format.Hridya Valsaraju2018-10-092-3/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required to pass fuzzy_fastboot conformance tests. Also, allow for zero sized partitions in fuzzy_fastboot. Test: ./fuzzy_fastboot --gtest_filter=Conformance.Slots Bug: 117220134 Change-Id: Ifb12994a7796b081215084cb68b37674210aaa12
* | | | | | | Merge "init: increase thermal shutdown timeout to 3s"Treehugger Robot2018-10-091-8/+7
|\ \ \ \ \ \ \
| * | | | | | | init: increase thermal shutdown timeout to 3sWei Wang2018-10-091-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) increase thermal shutdown timeout to 3s for process to save work 2) respect property "ro.build.shutdown_timeout" in thermal shutdown if it is set less than default time - "3s" Bug: 112432890 Test: Build Change-Id: Idc2b24dd44c1fab8f9b047fd2468de2ee45ff783
* | | | | | | | Merge "fs_mgr: fix incorrect parameter type"Treehugger Robot2018-10-091-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fs_mgr: fix incorrect parameter typebohu2018-10-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 117426573 Change-Id: Iffbdd3763dd19aa527bf805918a566477d122cfc
* | | | | | | | Merge "Move system/core/ off NO_ERROR."Elliott Hughes2018-10-0919-86/+83
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Move system/core/ off NO_ERROR.Elliott Hughes2018-10-0819-86/+83
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It causes trouble for Windows, and OK already exists. Bug: N/A Test: builds Change-Id: Ida22fd658b0ebb259c710ba39049b07c9e495d9c
* | | | | | | Merge "Check maximum allowed download size for download command."Treehugger Robot2018-10-083-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Check maximum allowed download size for download command.Hridya Valsaraju2018-10-083-2/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 117272937 Test: fastboot flashall Change-Id: Ied34a89129813a7f9fce6d4f48d8b65967558731
* | | | | | | Merge "Assert that ParseInt/ParseUint are only used with signed/unsigned ↵Tom Cherry2018-10-081-0/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | numbers respectively"
| * | | | | | Assert that ParseInt/ParseUint are only used with signed/unsigned numbers ↵Tom Cherry2018-10-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | respectively Test: build fails when the signedness is mismatched Test: build succeeds otherwise Change-Id: Idd6b146cc167d4607eafc81dbad6c2a79b167094
* | | | | | | Merge "fs_mgr: fs_mgr_update_verity_state cleanup"Treehugger Robot2018-10-081-10/+11
|\ \ \ \ \ \ \
| * | | | | | | fs_mgr: fs_mgr_update_verity_state cleanupMark Salyzyn2018-10-081-10/+11
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: compile Bug: 109821005 Change-Id: Ia2e7074dd4cfb86619da65a4acb1d06b47154070
* | | | | | | Merge changes Id6c00c76,Ibc74a12fTreehugger Robot2018-10-081-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Check return status of ReadFileToString() in GetDeviceLockStatus() Validate partition name when searching for physical partitions.
| * | | | | | | Check return status of ReadFileToString() in GetDeviceLockStatus()Hridya Valsaraju2018-10-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return lock status of true if unable to read kernel command line. Test: fastboot getvar unlocked Bug: 117275849 Change-Id: Id6c00c769bcdcdf87fcc9e88902713a8eff3e320
| * | | | | | | Validate partition name when searching for physical partitions.Hridya Valsaraju2018-10-081-0/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 117274137 Test: fastboot getvar has-slot:../by-name/system Change-Id: Ibc74a12f836a30bdf1fd7f6b2a1e941de2430c70
* | | | | | | Merge "android_filesystem_config add AID for iorapd"Treehugger Robot2018-10-081-0/+1
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 14:23:58 +0000