summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 6085360 from a41373acd02cc04e2ffa4088eb6ee0a964fd3dec to ↵HEADq10.0android-build-team Robot2019-12-195-0/+40
|\ | | | | | | | | | | qt-qpr2-release Change-Id: I65ca498018e0e7d8670183e17061266fa62d733f
| * Add build fingerprint checks to apexdGavin Corkery2019-12-135-0/+40
|/ | | | | | | | | | | | | | | | Staged sessions should be abandoned when the build fingerprint changes (in case of an OTA, for example). This change stores the build fingerprint as part of an APEX session, which is then verified upon reboot. Bug: 145840157 Test: Stage APEX install, reboot with same/different build fingerprints and verify session is completed/abandoned respectively Test: atest ApexServiceTest#SubmitStagedSessionStoresBuildFingerprint Change-Id: I90ff014e82e6913914f0d752bb43f10d5efc6f2c Merged-In: I90ff014e82e6913914f0d752bb43f10d5efc6f2c (cherry picked from commit 778cacee8bffc8d257245e71c05f705fa53078c1)
* apexd: fix bug in getAllPackages in case samegrade of system APEXNikita Ioffe2019-09-061-4/+1
| | | | | | | | | | | | | | | | In case of samegrade of a system apex, an apex on /data partition will be correctly reported by getAllPackages as the active one. Test: atest apexservice_test Test: atest CtsStagedInstallHostTestCases Test: adb pull /system/apex/com.google.android.tzdata.apex /tmp/tz.apex Test: adb install /tmp/tz.apex && adb reboot Test: adb shell cmd apexservice getAllPackages Test: adb shell cmd apexservice getActivePackages Change-Id: Ib20ddef5a1f61837799a61bd429afe5ff4bfd6a9 Merged-In: I828c87510cfac0ae14ba5c8bf949aa259182fe4a Bug: 140229069
* Disable timezone e2e tests in presubmit on qt-dev. Commenting feature is not ↵Chen Zhu2019-08-161-4/+0
|\ | | | | | | | | | | | | | | supported in TEST_MAPPING on qt-dev. Removed commented lines which cannot be parsed by TEST_MAPPING. am: e80de247e2 am: fe6e54d049 Change-Id: I02ab0b6135e8d7cbcbda6aa21a08e73057c05c32
| * Disable timezone e2e tests in presubmit on qt-dev. Commenting feature is not ↵Chen Zhu2019-08-161-4/+0
| |\ | | | | | | | | | | | | | | | | | | | | | supported in TEST_MAPPING on qt-dev. Removed commented lines which cannot be parsed by TEST_MAPPING. am: e80de247e2 Change-Id: I588a7ad885525843fbc754245e94b985888bcc79
| | * Disable timezone e2e tests in presubmit on qt-dev. Commenting featureChen Zhu2019-08-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not supported in TEST_MAPPING on qt-dev. Removed commented lines which cannot be parsed by TEST_MAPPING. Test: atest --test-mapping system/apex/tests Bug: 135515636 Bug: 139403969 Merged-In: I32f25d28398ea584ba8ebffa350b4a84f05a32de Change-Id: I4fa0e817757c11ee7d9a7391b683ffd34264dbd7
* | | Disable timezone e2e tests on qt-dev. am: 626fd0d5bbChen Zhu2019-08-081-3/+4
|\| | | | | | | | | | | | | | | | | am: 66cd90ad2a Change-Id: Icea20b2ebaddc2858cf971190318150ebfd4b132
| * | Disable timezone e2e tests on qt-dev.Chen Zhu2019-08-081-3/+4
|/| | | |/ | | | | | | | | am: 626fd0d5bb Change-Id: Idb903a1e977d94b17aee3dd2bf90caa06b854044
| * Disable timezone e2e tests on qt-dev.Chen Zhu2019-08-081-3/+4
| | | | | | | | | | | | | | | | Test: atest --test-mapping system/apex/tests Bug: 135515636 Merged-In: I32f25d28398ea584ba8ebffa350b4a84f05a32de Change-Id: I9c6c2c7e1d5d03e3d9c057f72be453904d029638
* | Add an optional flag for an assets/ dir.Jaewoong Jung2019-06-261-0/+4
|\| | | | | | | | | | | am: 036d505893 Change-Id: If9376abeaa5ef9a8749d9a0544c0fe37e7163692
| * Add an optional flag for an assets/ dir.Jaewoong Jung2019-06-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | This allows supplemental resource files (e.g. NOTICE output) to be included in the APEX under assets. Bug: 135218846 Test: Built Mainline modules + manual inspection Change-Id: Iafdbc9012ea72a2298b84e70779282c00f191f31 Merged-In: Iafdbc9012ea72a2298b84e70779282c00f191f31 (cherry picked from commit 2247d1d56781e832f79afe82637e725226a272d3)
* | Add missing return statement in ApexFile.verifyDescriptorNikita Ioffe2019-06-253-5/+21
|\| | | | | | | | | | | am: 8a8a356efa Change-Id: I32264f5019c3d9615f440182943303e496ec2ffb
| * Add missing return statement in ApexFile.verifyDescriptorNikita Ioffe2019-06-253-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | Fixed other places in apexd that didn't use resulting Status/StatusOr. Didn't mark Status and StatusOr as WARN_UNUSED as it will require changing code outside of apexd. Instead fixed them in AOSP. Test: m apexd Bug: 135682248 Fixes: 135682248 Change-Id: I3e362b3284bcdcc7e6d68e4691dc4f042f3af1da Merged-In: I3e362b3284bcdcc7e6d68e4691dc4f042f3af1da
* | swcodec: add a check for the case that the apex name is overridden.Dongwon Kang2019-06-171-1/+2
|\| | | | | | | | | | | am: 996e39f0a4 Change-Id: I6c1d9f3f9dfed6de9dc3a31a1f38a70b4b7f6e06
| * swcodec: add a check for the case that the apex name is overridden.Dongwon Kang2019-06-171-1/+2
| | | | | | | | | | | | | | | | Due to the lack of this check, the test was being skipped. Test: atest media_swcodec_e2e_tests Bug: 135294136 Change-Id: I35fa236ea24b4a92b36d99bdf00da43f1f40f8b8
* | Merge "Remove min sdk version and set target/max sdk version to 29" into qt-devJiyong Park2019-05-291-1/+0
|\| | | | | | | | | | | am: 876c0c0e29 Change-Id: I83b0536be8ad6bfc443b7dae489c7669481c057a
| * Merge "Remove min sdk version and set target/max sdk version to 29" into qt-devJiyong Park2019-05-291-1/+0
| |\
| | * Remove min sdk version and set target/max sdk version to 29Jiyong Park2019-05-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Min sdk version has been force set to 28 (P) to support beta devices. Since we now don't need to support them, we delete it. It is set to 29 by the build system. Target and max sdk versions are bumped to 29. Bug: 131128233 Test: m and check the sdk version numbers Change-Id: I9cebad754e7542309c5663123846436a0cbf83fa
* | | Use SHIM for InstallApexModuleTargetPreparer test.Dario Freni2019-05-282-2/+2
|\| | | | | | | | | | | | | | | | | am: b7742a2696 Change-Id: I9c5e960a458432eb83e8f8000e88a5b6267e0810
| * | Use SHIM for InstallApexModuleTargetPreparer test.Dario Freni2019-05-232-2/+2
| |/ | | | | | | | | | | | | | | | | | | We're removing the ability of installing non-preinstalled APEX files via adb. Bug: 133306156 Bug: 132429173 Test: atest --test-mapping system/apex/tests Change-Id: I9c47d9a29da51d61eeabfb1097a7cbbb6760e866
* | Update the default min sdk version for APEXes to 29Jiyong Park2019-05-161-1/+1
|\| | | | | | | | | | | am: 5331936773 Change-Id: I283193b1d8a040edb121a3b174ed8f67b9816017
| * Update the default min sdk version for APEXes to 29Jiyong Park2019-05-161-1/+1
|/ | | | | | | | | | | | | | APEXes exist starting from Q (29). So updating the min version value to 29. Note: APEXes that are mainline modules for Q (e.g. timezone, conscrypt, ...) are still having min sdk version set to 28 to support beta devices. When we no longer need to support them, we should remove the hard-coded min sdk version from the AndroidManifest.xml for the APEXes. Bug: 131128233 Test: m com.android.runtime.debug and check its min sdk version number Change-Id: Idfaee55c2efb1bbb81c15368001badf95d407782
* Merge "Update prebuilt shim apexes with the release platform" into qt-devIan Pedowitz2019-05-159-0/+0
|\
| * Update prebuilt shim apexes with the release platformJiyong Park2019-05-129-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package: name='com.android.apex.cts.shim_not_pre_installed' versionCode='1' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' package: name='com.android.apex.cts.shim' versionCode='1' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' package: name='com.android.apex.cts.shim' versionCode='2' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' package: name='com.android.apex.cts.shim' versionCode='2' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' package: name='com.android.apex.cts.shim' versionCode='2' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' package: name='com.android.apex.cts.shim' versionCode='2' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' package: name='com.android.apex.cts.shim' versionCode='2' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' package: name='com.android.apex.cts.shim' versionCode='2' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' package: name='com.android.apex.cts.shim' versionCode='3' versionName='' compileSdkVersion='29' compileSdkVersionCodename='10' sdkVersion:'28' targetSdkVersion:'29' Built from https://android-build.googleplex.com/builds/pending/P8597405/CtsApexShim_x86_64/latest Bug: 132505181 Test: aapt dump badging com.android.apex.cts.shim.v1.apex Target sdk version, compile sdk version are 29, not Q Change-Id: I04ef9a668e3810f838bf753610e9ec54b022ec3a
* | apexd: improve logging around triggering a rollbackNikita Ioffe2019-05-131-6/+18
|/ | | | | | Test: none Bug: 132324937 Change-Id: Ib63bb26af3069a3384ae1d10e44511411d82e6a3
* Merge "Revert "Revert "Don't mount non-flattened apexes if device doesn't ↵Nikita Ioffe2019-05-091-1/+20
|\ | | | | | | support them""" into qt-dev
| * Revert "Revert "Don't mount non-flattened apexes if device doesn't support ↵Nikita Ioffe2019-05-081-1/+20
| | | | | | | | | | | | | | | | | | | | | | them"" This reverts commit b097207ca25f94d157496d66dd8483a73a850647. Reason for revert: automotive now targets flatten apex Bug: 130623080 Test: cpct/boot/device_boot_test for hawk-userdebug on forrest Change-Id: I38ea0b323c4745eafe7118f213a15723ef6123fc
* | Merge "apexd: make apexservice_test exception-free" into qt-devTreeHugger Robot2019-05-092-27/+19
|\ \
| * | apexd: make apexservice_test exception-freeJooyung Han2019-05-082-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use APIs which can throw exceptions. - use WalkDir() helper instead of directory_iterator - use noexcept version of is_directory() Bug: 124662897 Test: atest apexservice_test Change-Id: Ifceffe982e866e8cf1858c66e3d0febf4c604e1a
* | | Merge "Don't preallocate loopback devices when ro.apex.updatable is not ↵TreeHugger Robot2019-05-081-2/+3
|\ \ \ | | | | | | | | | | | | true" into qt-dev
| * | | Don't preallocate loopback devices when ro.apex.updatable is not trueJiyong Park2019-05-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the devices where updatable APEX is not supported due to the lack of support for loopback devices, don't try to preallocate the loopback devices. Bug: 130379599 Test: arc boots Change-Id: Iefa7dcc8a04aa7773e8b056296d6b30c95e4c47c
* | | | Merge "Revert "Don't mount non-flattened apexes if device doesn't support ↵TreeHugger Robot2019-05-081-20/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| them"" into qt-dev
| * | Revert "Don't mount non-flattened apexes if device doesn't support them"Joseph Pirozzo2019-05-081-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a32ccec1c4d247e29eef4288706c303b9e71f08b. Reason for revert: Prevents Automotive devices from booting. Bug: 132181909 Change-Id: Iac539a9c45b4db24902b33715515c6c63afa3a41
* | | Merge "apexd: make exception-free" into qt-devTreeHugger Robot2019-05-072-21/+32
|\ \ \
| * | | apexd: make exception-freeJooyung Han2019-05-072-21/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use APIs which can throw exceptions. - add and use WalkDir() helper instead of directory_iterator - use noexcept version of is_block_file() Bug: 124662897 Test: atest apexservice_test Test: adb shell pm list packages --apex-only (after restart) Change-Id: Ie42ba763903521c43e21381e3ae9871cd71120fd
* | | | Merge "Don't mount non-flattened apexes if device doesn't support them" into ↵TreeHugger Robot2019-05-071-1/+20
|\ \ \ \ | |/ / / |/| / / | |/ / qt-dev
| * | Don't mount non-flattened apexes if device doesn't support themNikita Ioffe2019-05-021-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * During boot sequence, apexd will just ignore non-flattened apexes if ro.apex.updatable is not set to true. * Also added a safeguard in mountNonFlattened mostly for consistency. Test: test every mainline pixel phone boots & camera works Test: pre-installed shim apex on marlin, checked it wasn't activated Bug: 130623080 Change-Id: I69a3b4994dcf81e713eb76cc046943a999918950
* | | apexd: fix the way to restore database on startJooyung Han2019-05-051-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check bind-mount'ed flattened APEXes first. Some platforms use loop device to mount '/' and may have flattended APEXes. In this case, a loop device is associated to activated APEX, and trying to resolve the loop device as non-flattended APEX activation is simply wrong. Having pre-scanned list of flattened APEXes' (dev,inode) pairs, we can first check if mounted APEX is bind-mount'ed to a flattened APEX. Bug: 131924899 Test: atest apexservice_test Test: set up some flattened APEXes and see logcat if database is correctly restored. Change-Id: Id9e527e367e6593514625fe0c8deb66630a7a672
* | | Enable test logic MediaSwCodecHostTest.Dongwon Kang2019-05-032-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also remove e2e_media.*_tests from TEST_MAPPING since presubmit uses x86_64 test suite on 32bit cf_x86. Presubmit will be added later with real devices. Test: atest media_swcodec_e2e_tests adb shell lshal debug android.hardware.media.c2@1.0::IComponentStore/software Bug: 131869673 Change-Id: Ib4ab458bcfa6fd7cfebfdef77f070c3baec4098b
* | | Merge "apexd: Fix database population on startup" into qt-devTreeHugger Robot2019-05-031-1/+1
|\ \ \
| * | | apexd: Fix database population on startupJooyung Han2019-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While iterating mount-points from /proc/mount, it should skip mount-points which are not in /apex. Bug: 129525859 Change-Id: I542dbea2012fe8b74794f1decce3a70e90bc6197 Fix: 129525859 Test: atest apexservice_test Test: see logcat after restarting apexd
* | | | Merge "Substitute apex_e2e_tests with CtsStagedInstallHostTestCases" into qt-devNikita Ioffe2019-05-034-101/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Substitute apex_e2e_tests with CtsStagedInstallHostTestCasesNikita Ioffe2019-05-024-101/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | CtsStagedInstallHostTestCases is a superset of apex_e2e_tests, so there is no need in later. Bug: 131833833 Test: atest --test-mapping system/apex/tests Change-Id: Ieb538eaccd022c9c45dec0b166d9b21fbfc22b8e
* | | Merge "Move starting of filesystem checkpoint to apexd." into qt-devTreeHugger Robot2019-05-024-2/+30
|\ \ \ | |/ / |/| |
| * | Move starting of filesystem checkpoint to apexd.Martijn Coenen2019-05-024-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting a checkpoint can fail, and in that case we'd like to backup active APEXes, in order to revert back to the previous state. Starting a checkpoint was previously done from framework, but the logic and interface becomes cleaner if it's done in apexd instead (where it arguably belongs anyway). Bug: 126740531 Test: atest apexservice_test atest apex_e2e_tests Change-Id: I9b1297c1664c2d2b2f838bebdefabb9fc9e72b51
* | | Add versionName field to APEX manifest.Gavin Corkery2019-05-024-0/+9
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | The source of truth for an APEX version name is the manifest.json file, which is propagated via aapt to the AndroidManifest.xml. Test: adb shell cmd apexservice getAllPackages Test: Add versionName field to an apex manifest.json, make and then run aapt dump badging to the path of the output. Bug: 118739827 Change-Id: I4648237847d06d69016a72b620d5c8588d852c69 Merged-In: I4648237847d06d69016a72b620d5c8588d852c69 (cherry picked from commit 9463856c5223a9881ce93de5efd5c4368131ebf5)
* | Merge "Revert "Revert "Remove shim apex from apexd required modules ↵TreeHugger Robot2019-05-021-3/+0
|\ \ | | | | | | | | | dependency""" into qt-dev
| * | Revert "Revert "Remove shim apex from apexd required modules dependency""Jiyong Park2019-04-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e36c060b0a8bb96553be6f42895e283b52bf64bf. Reason for revert: all Pixels (except pixel 1) are ready to support updatable APEX Bug: 129035564 Change-Id: I982b37cbaffed013e21388433a12e3ee31b6028c
* | | apexd: use noexcept versions in ReadDir()Jooyung Han2019-05-021-26/+22
| | | | | | | | | | | | | | | | | | Bug: 124662897 Test: atest apexservice_test Change-Id: If955d037a67bb1c6e2a71cfbc01b6f88b9523152
* | | Merge "apexd: clean up (remove unused)" into qt-devTreeHugger Robot2019-05-024-75/+0
|\ \ \