summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: Iea25ab2acc22bf7e8dea6afeb5b26df04502e956 Change-Id: Ic89d41cf1c14fc0eb824c675baea05ff63e5e540
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I29c9fbb6fa3ecf335a3334a4a7365f86ef013542 Change-Id: Iea25ab2acc22bf7e8dea6afeb5b26df04502e956
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 583cdaaf2d -s ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devXin Li
ours am: 2528642aed -s ours am skip reason: Change-Id I4d94d75fb92a90e3e0c39c7077a876b647ff359f with SHA-1 bfad48a776 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I29c9fbb6fa3ecf335a3334a4a7365f86ef013542
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 583cdaaf2d -s oursXin Li
am skip reason: Change-Id I4d94d75fb92a90e3e0c39c7077a876b647ff359f with SHA-1 bfad48a776 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I96b9339368956e949a39ff80a30254711361dd00
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I4d94d75fb92a90e3e0c39c7077a876b647ff359f Change-Id: Ifd03fdf294f6fb3c9dea850a4dffb920b675324e
2020-11-24Mark ab/6881855 as merged am: 266defdc03 am: bfad48a776Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/13111971 Change-Id: Id57f60bb632585ff034de67fdafbfd203eaafd1f
2020-11-24Mark ab/6881855 as merged am: 266defdc03Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/13111971 Change-Id: I4d94d75fb92a90e3e0c39c7077a876b647ff359f
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I6d6c9ef7ef2e6c0fd3d012f4c08a6e4fd57e9f85
2020-10-14Remove xr directory am: 771c2254b9 am: 9baf655e38 am: 8fd689c67f am: e60aadc967Colin Cross
Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1458597 Change-Id: If9d84d76177bbb7a944f08fa1b50625713cda0cd
2020-10-14Remove xr directory am: 771c2254b9 am: 9baf655e38 am: 8fd689c67fColin Cross
Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1458597 Change-Id: I95fc55184664b88a8af6ca83dbde9936e1546659
2020-10-14Remove xr directory am: 771c2254b9 am: 9baf655e38Colin Cross
Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1458597 Change-Id: Ie068ed994986ead66e01ee06a35ff44cc8abc41a
2020-10-14Remove xr directory am: 771c2254b9Colin Cross
Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1458597 Change-Id: I7f9d51a4556444803512e62ae9e36233b6387d9b
2020-10-13Remove xr directoryColin Cross
It's not used. Test: m checkbuild Change-Id: I3c755a3aad3f7ffea8e2da67cdb6dfd4142c7738
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc ↵Xin Li
-s ours am: 009ea695e2 -s ours am: ef96f113d8 -s ours am: 50d9c7d656 -s ours am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I587ef020108cd80f0f10df13d2eaa3187bf1a599
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc ↵Xin Li
-s ours am: 009ea695e2 -s ours am: ef96f113d8 -s ours am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I53a90b521fb0bfe7aab65bbc12a90ba22684306f
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc ↵Xin Li
-s ours am: 009ea695e2 -s ours am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I73746a1e200a3328ca9dce303b4f9672058423b0
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc ↵Xin Li
-s ours am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I9814d4cee3031bd525ca58d182ea82db3bcbbfd0
2020-09-11[automerger skipped] Merge Android R am: b85105e946 -s oursXin Li
am skip reason: Change-Id I25f0ca04f2e967f35d377e923f73486b95dd47e3 with SHA-1 85259cdc08 is in history Original change: https://android-review.googlesource.com/c/device/google/vrservices/+/1422309 Change-Id: I0900e62cf0016dcef3d58158a529db87eb1dce24
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I25f0ca04f2e967f35d377e923f73486b95dd47e3 Change-Id: Ifa6d7d277cdceed5735850461d501e335e90a0d7
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85259cdc08 -s ours am: 2dd936b552 -s ours am: 1812408f22 -s ours am: f8554a7d1e -s ours am skip reason: Change-Id I67f9a083e27a7f5134c810d95d19360e6e5a1b8f with SHA-1 19240f7c55 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/12470033 Change-Id: I028e7e6c7e0c10b68c477e34c931058aeea5b75e
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85259cdc08 -s ours am: 2dd936b552 -s ours am: 1812408f22 -s ours am skip reason: Change-Id I67f9a083e27a7f5134c810d95d19360e6e5a1b8f with SHA-1 19240f7c55 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/12470033 Change-Id: I24ecfe07cdf95dc4703805efb3cd70c1723d8f5d
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85259cdc08 -s ours am: 2dd936b552 -s ours am skip reason: Change-Id I67f9a083e27a7f5134c810d95d19360e6e5a1b8f with SHA-1 19240f7c55 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/12470033 Change-Id: I39a227887e888b8876c2a9671eeb2906426e256f
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 85259cdc08 -s ours am skip reason: Change-Id I67f9a083e27a7f5134c810d95d19360e6e5a1b8f with SHA-1 19240f7c55 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/vrservices/+/12470033 Change-Id: I6fb6f00bb088df81d82275995b91ec346d5fe7fd
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I67f9a083e27a7f5134c810d95d19360e6e5a1b8f Change-Id: I25f0ca04f2e967f35d377e923f73486b95dd47e3
2020-06-28Add METADATA to vrservices: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: I4d53ef1fcca6529a5ffe28b614534fff3a1b5a5d
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 26db848a52 am: 7cb17e865f -s ours am skip reason: subject contains skip directive Change-Id: I67f9a083e27a7f5134c810d95d19360e6e5a1b8f
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
stage-aosp-master am: 26db848a52 Change-Id: Ib6c77292f616ce6939e8cbfae94db1c69f1f32ba
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I10408ec78855e2331dd556901e87e200b0a28e51
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: 4f104c9f70 am: 461c4c31b5Xin Li
am: 25452f657f Change-Id: Ie9e36c29fefcaf35a6ab20f8c7e2be993f6b9f2a
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: 4f104c9f70Xin Li
am: 461c4c31b5 Change-Id: Ic3ecf03c0a54055c0b4d0a035523620d84b3c09e
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: 4f104c9f70 Change-Id: I71c0c8fb043bbf99110add040133e6664c8200d7
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
Bug: 141248619 Change-Id: Iac69d623b6c72a1210ab73f752b1ed474d5db51f
2019-09-13Turn the lock screen off by default.Grant Yoshida
Bug: 141005456 Test: Wiped userdata on a OnePlus and verified lockscreen is disabled. Change-Id: If5ead126bd01a680dce16a3537a1cad996c47cff
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: a90a724d59 -s ours am: 12b4af1dd3 -s ours am: 656972aa76 -s ours am skip reason: change_id Ife0f708744ff9b2efdf900b9b5d58555f1487a11 with SHA1 d0da96f292 is in history Change-Id: If7afe4b3671940a01e7edddfe064774bf01c77bc
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: a90a724d59 -s ours am: 12b4af1dd3 -s ours am skip reason: change_id Ife0f708744ff9b2efdf900b9b5d58555f1487a11 with SHA1 d0da96f292 is in history Change-Id: I343e0b4a070069467cefcf73d883f2ce7a9ca114
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: a90a724d59 -s ours am skip reason: change_id Ife0f708744ff9b2efdf900b9b5d58555f1487a11 with SHA1 d0da96f292 is in history Change-Id: I0080389a9a4dbbb122f78dc500a918ff96a87fe9
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Iea0f26e243a0ac792868a69b321849a3b9cc6773 Merged-In: Ife0f708744ff9b2efdf900b9b5d58555f1487a11
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
d0da96f292 -s ours am: 12c705c0f7 am: 75e56f882f am: c7cfd7cd76 -s ours am skip reason: subject contains skip directive Change-Id: Ibddc718cf60101602bb514c09242e3f61abfb93e
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
d0da96f292 -s ours am: 12c705c0f7 am: 75e56f882f Change-Id: I0915b615fd62d4ccbf7efda3eab629633ce750d6
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
d0da96f292 -s ours am: 12c705c0f7 Change-Id: Iebe2cff95fc96d4fc997300afdcc47bb35697233
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: d0da96f292 -s ours am skip reason: subject contains skip directive Change-Id: I4f6c686b941b05a1d03bb55633c58a2a8f4df343
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: Ife0f708744ff9b2efdf900b9b5d58555f1487a11
2019-09-03Add a custom overlay for SetupWizardOverlay, SetupWizardOverlayXr.Grant Yoshida
This fixes a hang when the setup wizard checks for OTA updates. For now, all the overlay does is disable the OTA update step. Bug: 137600556 Test: Ran SetupWizardOverlay with GSI XR. Change-Id: I1b268388d6fb67840eac98e5f8ce543d09f74a31
2019-08-23Update boot-to-vr.sh to replace the init.xr.rc file.Grant Yoshida
Somehow this was missed when this file was moved from vendor. Test: "adb shell boot-to-vr.sh true" on an MTP. Change-Id: Ic67fb1638f4196287daeba8a0fbf84c0806d0ef8
2019-08-21Fix bluetooth not working on the OnePlus7 Pro.Grant Yoshida
For GSI XR, added a symlink from libbluetooth_qti.so to libbluetooth.so. Bug: 139486342 Test: Paired a controller running GSI XR on the OnePlus7 Pro. Change-Id: I599ed4dd8e14ae68800478a80bd98229aa0a1229
2019-08-20Merge "Move boot-to-vr.sh to device/google/vrservices."TreeHugger Robot
2019-08-20Move boot-to-vr.sh to device/google/vrservices.Grant Yoshida
Test: Ran script on a GSI XR MTP. Change-Id: I332fe62d71864465ce25a7013433e404fff00123
2019-08-19Fix some additional selinux errors.Grant Yoshida
These came up on boot after fixing the previous errors. Test: GSI XR on an MTP, booted into VR. Change-Id: I35362e2660ec8f38799429981f15552272dcc2fe
2019-08-19Fix GSI selinux policies.Grant Yoshida
Install them into the system partition using BOARD_PLAT_PRIVATE_SEPOLICY_DIR. Bug: 139096707 Test: Verified that pp selinux errors no longer occur on an MTP. Change-Id: I9bae2030aa225baaf8c4f819f2f532201928875c
2019-08-16Merge "Adding in system property to ignore sensor change for pluggy build."Mike Ma
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 22:07:29 +0000