summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-08-16Merge "Add SELinux rules that are common to XR devices."Grant Yoshida
2019-08-15Adding in system property to ignore sensor change for pluggy build.mamik
Adding a new system property to be able to determine if the build is a pluggy build to be able to ignore the sensor change. Bug: 139493372 Test: Manual, ran the build on the device. Change-Id: I1b1b3b6c831a2f11fd0f222fa3b6d113a10e4353
2019-08-10Merge "Copy XR config files to system image instead of vendor image"TreeHugger Robot
2019-08-09Merge changes from topic "gsi_xr_master"TreeHugger Robot
* changes: Set ro.surface_flinger.use_vr_flinger for XR targets Add init.xr.rc.
2019-08-09Copy XR config files to system image instead of vendor imageJiwen 'Steve' Cai
Bug: 137033145 Test: Build and flash gsi_xr Change-Id: I1ec711c43a4740db25560d038691eac382d7df10
2019-08-07Add experimental_google_xr.mk to device/google/vrservices/xr/products.Grant Yoshida
This is copied from /vendor/google/products. Bug: 139089383 Test: N/A Change-Id: I2ea0c11588de863ee739ded72021ea7f06326c69
2019-07-19Add SELinux rules that are common to XR devices.Grant Yoshida
This starts by adding rules that enable VrHeadsetPowerPolicy to get and set some specific system properties. This is the same change as ag/8549530 except that these rules now live in device/google/vrservices instead of device/google/daydream. Bug: 137202034 Test: Booted into Pixel XR and ran 'adb shell pps-tool.sh info'. The service is no longer crashing with an "unable to set property" exception and seems to be working properly. Change-Id: I03acd99a2d660388972fc47f5910ba57fcbf6d99 Merged-In: I03acd99a2d660388972fc47f5910ba57fcbf6d99 (cherry picked from commit 0c3a3d4329ac6d2d67c2226672ff8d8d35c21309)
2019-07-17Set ro.surface_flinger.use_vr_flinger for XR targetsJiwen 'Steve' Cai
This is needed for SurfaceFlinger to load libvrflinger. Bug: 137325030 Test: Build and flash gsi_xr Change-Id: I52496660a7390c3650fda79345adde41a1ff45c6
2019-07-17Add init.xr.rc.Grant Yoshida
This was moved from device/google/crosshatch. Bug: 137238738 Test: Booted into Pixel XR. Change-Id: Icc8a7f5a97cc600b82b78d2c290bc10780a0a5ec Merged-In: Icc8a7f5a97cc600b82b78d2c290bc10780a0a5ec (cherry picked from commit 159c9e03599dd8392c3a1754167f0307f9ce1023)
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 4849ce295f -s ours am: 79d5de0777 am: 4e99f684fb -s ours am skip reason: subject contains skip directive Change-Id: I363cdc8de1a18af3351ef0b6dc7838d6f9045ac1
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 4849ce295f -s ours am: 79d5de0777 Change-Id: I117119a9dd71b670812e350ed327e00a07edda69
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵temp_140451723Xin Li
(5699924) into stage-aosp-master am: 4849ce295f -s ours am skip reason: subject contains skip directive Change-Id: I51b2d4558798afa8877c1ceafaf4323e434dde60
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: Ia08ce670b60196f02d50dd34eae4be4f89a56a51
2019-06-20Snap for 5674532 from 78d7565d394a816dcd9f49981056e3ce73b24bae to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: I7531f177086ebd8cac21a3795c52be674f4f307b
2019-06-19Merge branch 'oc-dr1-daydream-dev' into goog/qt-dev am: d1b4c07768 am: ↵Jiwen 'Steve' Cai
78d7565d39 am: 7e0d187b37 Change-Id: Ic70d4d2ca39948213dda3c4a2f5cb2b668477898
2019-06-19Merge branch 'oc-dr1-daydream-dev' into goog/qt-dev am: d1b4c07768 am: ↵Jiwen 'Steve' Cai
f5d468e8b0 am: 4138919cb3 Change-Id: I38d8fa57bc9a74fdc2dce3782f6e9a45aa9855c2
2019-06-19Merge branch 'oc-dr1-daydream-dev' into goog/qt-dev am: d1b4c07768Jiwen 'Steve' Cai
am: 78d7565d39 Change-Id: Iada9483dd8aec10e8e2a96e9c2289ee36e8ad73c
2019-06-19Merge branch 'oc-dr1-daydream-dev' into goog/qt-dev am: d1b4c07768Jiwen 'Steve' Cai
am: f5d468e8b0 Change-Id: I75056ac4fda007688dc6c395a4ffca9564990f7b
2019-06-19Merge branch 'oc-dr1-daydream-dev' into goog/qt-devandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseJiwen 'Steve' Cai
am: d1b4c07768 Change-Id: I9ce5c29f5dafd67a0f955be7670c3fc8052e38a6
2019-06-19Merge branch 'oc-dr1-daydream-dev' into goog/qt-devJiwen 'Steve' Cai
am: d1b4c07768 Change-Id: I9be17b96fdf2dba9bfbdd9916b53112511831f55
2019-06-19Merge branch 'oc-dr1-daydream-dev' into goog/qt-devJiwen 'Steve' Cai
am: d1b4c07768 Change-Id: If9ad466beee0de5a103c5f1665c90f1e7c548fa9
2019-06-13Merge branch 'oc-dr1-daydream-dev' into goog/qt-devandroid10-devJiwen 'Steve' Cai
Bug: 135069613 Test: just merge the branch, nothing works yet Change-Id: Ifd33b9cbb3a2c77e9dd855d628798cb71a0393bc
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: 719ecaf028 -s ours am skip reason: subject contains skip directive Change-Id: I804c5ed88bb11421826d4ceb564b24a0c0e227b1
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ib71e08446ec775d04001c6ed52a8a46b958e72a0
2019-01-28vrcore_app: add tmpfs type.Jeff Vander Stoep
ERROR 'unknown type vrcore_app_tmpfs' at token ';' on line 51956: Bug: 122854450 Test: build walleye_xr-userdebug Change-Id: I71277993bb7edae94a3ca4026fb8e6427340ebac
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 21:23:49 +0000