summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
Bug: 319669529 Merged-In: Ife84097390baf384aa04c591e412e4fdf5014701 Change-Id: Iddd5b753595358f3b616f59756220ea705c1f53d
2024-02-12Migrate Test Targets to New Android Ownership Model am: 1aa7c0ef84temp_319669529Aditya Choudhary
Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2946505 Change-Id: Ife84097390baf384aa04c591e412e4fdf5014701 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I7bc2cdb498449193e3bde6bfbb0a1da3fcb8dc45
2024-01-23Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: I5ae3f66d8f72401568dddcac72927a87919b8afa Change-Id: I7a065e949f05e03b63363b63c535eb2cbcc649ba
2024-01-19Clean up empty jar reference am: 0a71c4080dRex Hoffman
Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2918747 Change-Id: I2d0d67b8ca5ac3226abc11f90adb1e06843d1831 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19Clean up empty jar referenceRex Hoffman
Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows We maintain /external/robolectric (keep it in sync with github/google3) and are getting ready to delete /external/robolectric-shadows Removing a dependency on an empty jar Bug: 314757990 Test: atest on project (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9120f686ef585834df7ed4e0162bd415d36afa7) Merged-In: I3ae0f8c45a1bb11146accb7fd395deb43295f07c Change-Id: I3ae0f8c45a1bb11146accb7fd395deb43295f07c
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 482213d76c -s ours am: ↵Xin Li
4a352a8553 -s ours am: 1a8ec34087 -s ours am skip reason: Merged-In Icdded7cc7b56d30218c904e4fc422e0094a39900 with SHA-1 50c2c2740c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2866049 Change-Id: I53d10d737cf234ce5b746dbcb09d4ac1ee97df21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 482213d76c -s ours am: ↵Xin Li
4a352a8553 -s ours am skip reason: Merged-In Icdded7cc7b56d30218c904e4fc422e0094a39900 with SHA-1 50c2c2740c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2866049 Change-Id: Ib5a0a93cdcac8a371bea826f774e905eac9c96ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 482213d76c -s oursXin Li
am skip reason: Merged-In Icdded7cc7b56d30218c904e4fc422e0094a39900 with SHA-1 50c2c2740c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2866049 Change-Id: Iccc2dc4768105d10f576e8c397d64f52e57d8f4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: Icdded7cc7b56d30218c904e4fc422e0094a39900 Bug: 315507370 Change-Id: I75041f02d02ada176aa1effcf59342856ab8126a
2023-10-19[automerger skipped] Merge 10952656 am: 50c2c2740c -s ours am: 65c6988302 -s ↵Xin Li
ours am skip reason: Merged-In Ic68156f666c56c73ffd82adb08a49a7f398202d6 with SHA-1 3fcaa09bb0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/25089832 Change-Id: Ia04812698a2128ebaf14b6c61cdc603cb510a61e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: 50c2c2740c -s oursXin Li
am skip reason: Merged-In Ic68156f666c56c73ffd82adb08a49a7f398202d6 with SHA-1 3fcaa09bb0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/25089832 Change-Id: I509e1cabd56823b38cb7f61fd099c4dd834f3437 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Ic68156f666c56c73ffd82adb08a49a7f398202d6 Change-Id: Icdded7cc7b56d30218c904e4fc422e0094a39900
2023-10-07Clean up obsolete aliases for Truth. am: 2fe763bd21 am: 38317a1807 am: ↵Krzysztof Kosiński
97e44a616b am: 51fdfb907c am: 3fcaa09bb0 Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2778188 Change-Id: I6ad8e0fcce0435ff462d1d00cf191eb7657a8daa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 2fe763bd21 am: 38317a1807 am: ↵Krzysztof Kosiński
97e44a616b am: 51fdfb907c Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2778188 Change-Id: Ic68156f666c56c73ffd82adb08a49a7f398202d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 2fe763bd21 am: 38317a1807 am: ↵Krzysztof Kosiński
97e44a616b Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2778188 Change-Id: I238f0a6fcfe3259d25cbb729a46876b6d61e269f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 2fe763bd21 am: 38317a1807Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2778188 Change-Id: I20ee56b47fab1c9371fc0d1ed603065a9481f1d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: 2fe763bd21Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2778188 Change-Id: Ib6da07c9c500e5fb60e21c81940ffde0e6fdf02d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth.Krzysztof Kosiński
Bug: 255714762 Test: presubmit Change-Id: Ifd18fde4e675c505b9db9811690cd1f780b56463
2023-10-07[automerger skipped] Merge Android 14 am: c96a0eb956 -s ours am: fc9a87ceff ↵Xin Li
-s ours am: eec363ea43 -s ours am: 9f6962fb62 -s ours am: 6826b0d05d -s ours am skip reason: Merged-In Ic58507131adc70687c4d06e22612203b97d8bae7 with SHA-1 3bfb050f3f is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2776937 Change-Id: I6c4f73f159a1a521a9a9401cded1126efec8cdc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: c96a0eb956 -s ours am: fc9a87ceff ↵Xin Li
-s ours am: eec363ea43 -s ours am: 9f6962fb62 -s ours am skip reason: Merged-In Ic58507131adc70687c4d06e22612203b97d8bae7 with SHA-1 3bfb050f3f is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2776937 Change-Id: I81be176d4182ff02fb3f936b2787da34ada67ebb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: c96a0eb956 -s ours am: fc9a87ceff ↵Xin Li
-s ours am: eec363ea43 -s ours am skip reason: Merged-In Ic58507131adc70687c4d06e22612203b97d8bae7 with SHA-1 3bfb050f3f is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2776937 Change-Id: I699cea2412f0e6d381199ec568b9725733ce3540 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: c96a0eb956 -s ours am: fc9a87ceff ↵Xin Li
-s ours am skip reason: Merged-In Ic58507131adc70687c4d06e22612203b97d8bae7 with SHA-1 3bfb050f3f is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2776937 Change-Id: I82f8e89d70fcc3d454563dd2522dc35d47db3d4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: c96a0eb956 -s oursXin Li
am skip reason: Merged-In Ic58507131adc70687c4d06e22612203b97d8bae7 with SHA-1 3bfb050f3f is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/2776937 Change-Id: Iee51a2bff6b99ce5d9ca2178f94a4e1d0f095d52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Ic58507131adc70687c4d06e22612203b97d8bae7 Change-Id: Iaa40045999f719f9a961d8f881baa02581932889
2023-09-25Merge "Use @UsesReflection for FeatureFactory keep rule" into mainTreehugger Robot
2023-09-25Use @UsesReflection for FeatureFactory keep ruleJared Duke
Ensure FeatureFactory implementations are kept using a @UsesReflection annotation at the callsite where they are instantiated via reflection. Also clean up the remaining stale/unnecessary keep rules. Bug: 272041779 Test: m + validate FeatureFactoryImpl is kept Change-Id: I5ae3f66d8f72401568dddcac72927a87919b8afa
2023-08-31Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into ↵Automerger Merge Worker
udc-d1-dev-plus-aosp am: 8759977034 am: 0e08d21e6d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I57a5fc5e15d48015b7525df7cba07535ad0d3a2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
82a752b80f -s ours" into udc-dev-plus-aosp am: 2f0edbdaf7 -s ours am: 1f9007e677 -s ours am: 4c692692de -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I486901023525a229a0aa2bfd638db3f5f1658d0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
82a752b80f -s ours am: edf729c5df -s ours" into udc-d1-dev-plus-aosp am: ea9c1a6b9b -s ours am: 17d796e950 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: Ia5735fa5bb9f1bdb07c6a2cbb536b973777a3ed2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am: edf729c5df -s ours am: 4500f23876 -s ours am: b48316aea5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: Ic6bb82063930a0ea033b8c49a06e0369c454b348 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3bfb050f3f -s ours am: 7271eae529 -s ours am: 212e3a2fc3 -s ours am: 32d3b4ba2a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24607390 Change-Id: If521e31ad07c06881a4fc4609720d43d8d826185 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into ↵Automerger Merge Worker
udc-d1-dev-plus-aosp am: 8759977034 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I15971a15b015f3f30a7c9829329008ba34aaffd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
82a752b80f -s ours" into udc-dev-plus-aosp am: 2f0edbdaf7 -s ours am: 1f9007e677 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I46939ee53077a093829f9ae9a1b523dfb495b2e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
82a752b80f -s ours am: edf729c5df -s ours" into udc-d1-dev-plus-aosp am: ea9c1a6b9b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I11f57139ad21b9b66408bde611f23afba904066b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am: edf729c5df -s ours am: 4500f23876 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I8be4335138557893bbe91daa7afe3a97f8988317 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3bfb050f3f -s ours am: 7271eae529 -s ours am: 212e3a2fc3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24607390 Change-Id: If9478dbd4ff4abf5c44ee403636732bc9669102a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into ↵Automerger Merge Worker
udc-d1-dev-plus-aosp * changes: Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82a752b80f -s ours" into udc-dev-plus-aosp am: 2f0edbdaf7 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82a752b80f -s ours am: 5d9c74e6e2 -s ours
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am: edf729c5df -s ours am: a223adefcf -s ours am: 98fe066b3d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I772856eabdf05d4248de278deb370c2d07c40f6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
82a752b80f -s ours" into udc-dev-plus-aosp am: 2f0edbdaf7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I7d07a05f0ed07a194939d1497d201e30db6c480f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
82a752b80f -s ours am: edf729c5df -s ours" into udc-d1-dev-plus-aosp
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am: 5d9c74e6e2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I86780b82c2620efe7b593f076f2841b53613e260 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3bfb050f3f -s ours am: 7271eae529 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24607390 Change-Id: Ie9e0c37fd9aab94becf8f4fbf99982c3b288e466 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am: edf729c5df -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I83190e37c26a7e152dcca2c1e46b9321020ad95e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am: edf729c5df -s ours am: a223adefcf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I4f28b18cc98598d2dc0cd75d8ed6b6c077fd5366 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am: edf729c5df -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: Id20edf1350b76243fe026cc57d28254f9c8b36f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: I1ff9e73654708c4631a696f118937eb7754eb529 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
82a752b80f -s ours am: 679a7b2f03 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24610399 Change-Id: If7a191fed51cfdfb134699e6c5c39b82e576ea4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
82a752b80f -s ours" into udc-dev-plus-aosp
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3bfb050f3f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/24607390 Change-Id: I6ae2895ee1bbcc279763a27ba397c590a15eed1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 04:36:32 +0000