summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-07Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT ↵temp_sam_210511427temp-sc-samSasha Smundak
am: 721e015b18 Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1910271 Change-Id: I722b8adfa0dd5b189b431ad958adfb7439a2f80c
2021-12-03Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCTSasha Smundak
The statement ``` include $(PHONE_CAR_BOARD_CONFIG) ``` is difficult to translate to the Starlark configuration file. Fortunately, all the potential values of this variable have have similar structure, so ``` PHONE_CAR_BOARD_CONFIG := device/google_car/foo/BoardConfig.mk .... include $(PHONE_CARD_BOARD_CONFIG) ``` can be changed to ``` PHONE_CAR_BOARD_PRODUCT := foo .... include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk ``` Bug: 190051051 Test: treehugger Change-Id: Iaa0797417d43b7c91e1501b41cde89dd04ed502a
2021-11-17Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918Xin Li
Bug: 205056467 Merged-In: I08790ad8399b6677b944cc5222b29fefdf96d4e4 Change-Id: I4e7ae98899af7233fe640bb09cbcaf579fdf3dbb
2021-11-04Removing 'verity_update_state' am: 46654ef4a7Bowgo Tsai
Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1878093 Change-Id: I4e4a61460ffd947c96ade3ceb3a9136c151d635b
2021-11-03Removing 'verity_update_state'Bowgo Tsai
This is not needed in device-specific init.rc file, because it's is superseded by commit I300265f4af9c2781d40537f391bda9eaf62c27ba. Bug: 203720638 Test: presubmit Change-Id: I9c29d0b82cdb7422253e2e0df9e11070b32bdc19
2021-10-08[automerger skipped] Merge Android 12 am: eb61fee83b -s ours am: 4a4aa9bfff ↵Xin Li
-s ours am: 0df696ed1d -s ours am skip reason: Merged-In If7fe58903c358f41b0ce8ea2bb8dfc198b5d443d with SHA-1 1469c675df is already in history Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1847342 Change-Id: I08790ad8399b6677b944cc5222b29fefdf96d4e4
2021-10-08[automerger skipped] Merge Android 12 am: eb61fee83b -s ours am: 4a4aa9bfff ↵Xin Li
-s ours am skip reason: Merged-In If7fe58903c358f41b0ce8ea2bb8dfc198b5d443d with SHA-1 1469c675df is already in history Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1847342 Change-Id: Ic3c56904ae20844f213ccd7e428f7ae86b2c27dc
2021-10-08[automerger skipped] Merge Android 12 am: eb61fee83b -s oursXin Li
am skip reason: Merged-In If7fe58903c358f41b0ce8ea2bb8dfc198b5d443d with SHA-1 1469c675df is already in history Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1847342 Change-Id: I366d431f55353aa47ba98de1e7e3c6a4d2d094ea
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: If7fe58903c358f41b0ce8ea2bb8dfc198b5d443d Change-Id: I9590521a5812d9f15badef793991c4c4a85809ff
2021-09-29[automerger skipped] Merge SP1A.210812.016 am: 1469c675df -s ours am: ↵Xin Li
1e94f031c2 -s ours am skip reason: Merged-In I4991e685c3af650fa0c12051b763adff44cd9453 with SHA-1 c363791f1a is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15931950 Change-Id: I3769fdb42c6e7ed09d7894c8a4cc3272ec177d1d
2021-09-29[automerger skipped] Merge SP1A.210812.016 am: 1469c675df -s oursXin Li
am skip reason: Merged-In I4991e685c3af650fa0c12051b763adff44cd9453 with SHA-1 c363791f1a is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15931950 Change-Id: If4b8cab1212266e63613a5f0c7db980ca47a30b2
2021-09-28Merge SP1A.210812.016temp_sam_202323961Xin Li
Merged-In: I4991e685c3af650fa0c12051b763adff44cd9453 Change-Id: If7fe58903c358f41b0ce8ea2bb8dfc198b5d443d
2021-09-28DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: ↵Xin Li
ee7bf21303 am: 6659422911 Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15928355 Change-Id: Ifb06d7a41c6c5d2f4771a05fba4aee1c5180efa8
2021-09-28DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: ↵Xin Li
ee7bf21303 Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15928355 Change-Id: I0b08848ecc578dae2daf3651611f689f1edec4dd
2021-09-28DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already mergedXin Li
Merged-In: I2b7379a8256105147ed8a8f5ba507051c27f4bba Change-Id: I35d774e47be204ebcddfec9db44964914b91c028
2021-09-24Merge "Customize Crosshatch/Blueline status bar system icons padding" into ↵TreeHugger Robot
sc-qpr1-dev-plus-aosp
2021-09-24Customize Crosshatch/Blueline status bar system icons paddingBill Lin
Auto merger flow: sc-qpr1-dev > sc-qpr1-dev-plus-aosp > sc-v2-dev-plus-aosp > master This CL CP from sc-qpr1-dev to avoid sc-*-dev-plus-aosp conflict 1. Move dimen res from config.xml to dimens.xml 2. Adjust the padding system_icons_keyguard_padding_end Test: atest SystemUITests Test: manual review visual Bug: 195670442 Fixes: 198252802 Change-Id: I65ef9a83b209e07aa583e42c6e6bdcb994a029ce Merged-In: I65ef9a83b209e07aa583e42c6e6bdcb994a029ce
2021-09-10Merge "Customize Crosshatch/Blueline status bar system icons padding" into ↵TreeHugger Robot
sc-qpr1-dev am: 5ce18a9e92 Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15726440 Change-Id: Iaf14b9ae55f0a8da7b40f03d91ae1cecd9511323
2021-09-10Merge "Customize Crosshatch/Blueline status bar system icons padding" into ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseTreeHugger Robot
sc-qpr1-dev
2021-09-09[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: ↵Bill Yi
29b5f584b4 -s ours am: 2fcef760f6 -s ours am: 8c413a11d1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1822867 Change-Id: I45bf6ab4948dc0592bbeead256d49ab005a11619
2021-09-09[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: ↵Bill Yi
29b5f584b4 -s ours am: 2fcef760f6 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1822867 Change-Id: If8fe0cc2477c69a4d445ca918116e82590d00dad
2021-09-09[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: ↵Bill Yi
29b5f584b4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/device/google/crosshatch/+/1822867 Change-Id: I6a908cc7d72b166fd61e426832993e71d511f850
2021-09-09Use vintf for confirmation UI am: 6c8e74da13ichihlu
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15786560 Change-Id: Ie22bfddd704332d2766bea80a8115a233bcf48ca
2021-09-09Use vintf for confirmation UIichihlu
Bug: 198291202 Test: Build pass Change-Id: I52e1c08f1ac10952ecaab387b2469554a45e5aef (cherry picked from commit c4110d7ccf2fc87b97d7fa61230379075f8c6285)
2021-09-08Merge RQ3A.210905.001 to aosp-master - DO NOT MERGEBill Yi
Merged-In: I49dee7626774218bccb4c6457359a82d8277d014 Merged-In: Id4609544d49a376290d720246dcddf8f81e4d143 Merged-In: Id4609544d49a376290d720246dcddf8f81e4d143 Change-Id: Ibf1e4d415935ae8e64c6a0a8c7e6ffe953b88f03
2021-09-02Merge cherrypicks of [15749384, 15749385, 15749021, 15749367, 15749149, ↵android-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r3android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android12-tests-releaseandroid12-security-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseAndroid Build Coastguard Worker
15749150, 15749402, 15748246, 15748540, 15749368, 15749369, 15749386, 15749387, 15749403, 15749404] into sc-release Change-Id: Ifecb708a6001c34a6147207451d9dfaccad6184a
2021-09-02Update Crosshatch SVN to 59Neha Jain
Bug: 198443012 Change-Id: I050eb7410634347c04042b0809eb5fc13c822aab (cherry picked from commit 2660db585ee3b43c3c8a54e302adfc57577c07b3)
2021-09-02Update Crosshatch SVN to 59 am: 2660db585e am: 0d4923652eNeha Jain
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15741422 Change-Id: Id767c2bb568292ce4c14a1a4862892bdba6d57ec
2021-09-02Update Crosshatch SVN to 59 am: 2660db585e am: c243e40a33Neha Jain
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15741422 Change-Id: Ibef5fc62b23748d761ff7193a8460ec20c60a615
2021-09-02Update Crosshatch SVN to 59 am: 2660db585eNeha Jain
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15741422 Change-Id: Id13b03d7f5caeabab092455178985aca53f8ef30
2021-09-02Update Crosshatch SVN to 59 am: 2660db585eNeha Jain
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15741422 Change-Id: I77ff831fcddc7e1903cbb8d738bce34afa78703a
2021-09-01Update Crosshatch SVN to 59Neha Jain
Bug: 198443012 Change-Id: I050eb7410634347c04042b0809eb5fc13c822aab
2021-08-31Customize Crosshatch/Blueline status bar system icons paddingBill Lin
1. Move dimen res from config.xml to dimens.xml 2. Adjust the padding system_icons_keyguard_padding_end Test: atest SystemUITests Test: manual review visual Bug: 195670442 Fixes: 198252802 Change-Id: I65ef9a83b209e07aa583e42c6e6bdcb994a029ce Merged-In: I65ef9a83b209e07aa583e42c6e6bdcb994a029ce
2021-08-26[automerge] Update Crosshatch SVN to 58 2p: c363791f1a am: 23ecf3d8e0Presubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15676634 Change-Id: Id13c94fea2be6636edbdc587915dca0b29cf0559
2021-08-26[automerge] Update Crosshatch SVN to 58 2p: c363791f1a am: 269d97a1bfPresubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15676634 Change-Id: I0bfa172ad9cebee9df672b412a4a50d317c4403f
2021-08-25Merge cherrypicks of [15676045, 15677253, 15676249, 15675950, 15677460, ↵android-12.0.0_r1Android Build Coastguard Worker
15678098, 15676093, 15677860] into sc-release Change-Id: I97bc7277aad0bc062a9050d4ec28551366a5948f
2021-08-25Update Crosshatch SVN to 58Paul Scovanner
Bug: 193547118 Change-Id: I4991e685c3af650fa0c12051b763adff44cd9453 (cherry picked from commit c363791f1a818dcfe69c8535873032ab344896ae)
2021-08-25[automerge] Update Crosshatch SVN to 58 2p: c363791f1aPresubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15676634 Bug: 193547118 Change-Id: I02d66d2739a575cefc5fb3d7a957d5221ec5ba80
2021-08-25[automerge] Update Crosshatch SVN to 58 2p: c363791f1aPresubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15676634 Bug: 193547118 Change-Id: I096873fb193f7188c4b8a2c069832c0de9b1e416
2021-08-25Update Crosshatch SVN to 58Paul Scovanner
Bug: 193547118 Change-Id: I4991e685c3af650fa0c12051b763adff44cd9453
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
5dafaaa8c3 -s ours am: 0a55227489 -s ours am skip reason: Merged-In I9971616d3fff6520903768433e7e52f4b4c4aae2 with SHA-1 12e5a5465a is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15572047 Change-Id: I3ee1bb573418072858a21b68f311291a5ca028e7
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
5dafaaa8c3 -s ours am skip reason: Merged-In I9971616d3fff6520903768433e7e52f4b4c4aae2 with SHA-1 12e5a5465a is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15572047 Change-Id: Icdcf3b1439d21f1ece245d34a9f8885b2a128f67
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li
Merged-In: I9971616d3fff6520903768433e7e52f4b4c4aae2 Change-Id: I49dee7626774218bccb4c6457359a82d8277d014
2021-08-13[automerger skipped] Update Crosshatch SVN to 55 am: 11b2105e40 -s ours am: ↵Paul Scovanner
ac2f24aa54 -s ours am: 280c8edab7 -s ours am skip reason: Merged-In I9f6826af6de5e8501b9641dc5f6fd635b8611477 with SHA-1 844d2cb936 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15547399 Change-Id: I1c305d04ae773f430330d92ff989dc24edf78df5
2021-08-13[automerger skipped] Update Crosshatch SVN to 55 am: 11b2105e40 -s ours am: ↵Paul Scovanner
ac2f24aa54 -s ours am: 124307d592 -s ours am skip reason: Merged-In I9f6826af6de5e8501b9641dc5f6fd635b8611477 with SHA-1 844d2cb936 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15547399 Change-Id: I125739aa8781f48d4e6d1fb2a5660a193f20c450
2021-08-13[automerger skipped] Update Crosshatch SVN to 55 am: 11b2105e40 -s ours am: ↵Paul Scovanner
ac2f24aa54 -s ours am skip reason: Merged-In I9f6826af6de5e8501b9641dc5f6fd635b8611477 with SHA-1 844d2cb936 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15547399 Change-Id: I321b65ef3a401e042334641709c105d90c009115
2021-08-13[automerger skipped] Update Crosshatch SVN to 55 am: 11b2105e40 -s ours am: ↵Paul Scovanner
ac2f24aa54 -s ours am skip reason: Merged-In I9f6826af6de5e8501b9641dc5f6fd635b8611477 with SHA-1 844d2cb936 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15547399 Change-Id: Ifbc020f68f9db695b02e2286dadac3afda285da2
2021-08-13[automerger skipped] Update Crosshatch SVN to 55 am: 11b2105e40 -s oursPaul Scovanner
am skip reason: Merged-In I9f6826af6de5e8501b9641dc5f6fd635b8611477 with SHA-1 844d2cb936 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15547399 Change-Id: I4da6340d6315961fb85bf5fe45c2ce8e3c50c87e
2021-08-13Update Crosshatch SVN to 55Paul Scovanner
Bug: 193547118 Change-Id: Ibaa11d34fdedb22edf535c458ae57adbbfff7e65 Merged-In: I9f6826af6de5e8501b9641dc5f6fd635b8611477
2021-08-06Snap for 7616100 from 502830caef3740038a5b085493afb9544984e1a3 to sc-releaseAndroid Build Coastguard Worker
Change-Id: I2b7379a8256105147ed8a8f5ba507051c27f4bba
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 12:41:27 +0000