summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-12-10[automerger skipped] DO NOT MERGE am: 5471f7ac4c -s ours am: 96ebb11efd -s ↵Xin Li
ours am: f293cecabf -s ours Change-Id: I85b4c0445ee657297f911a8945c31b2e031ef450
2018-12-10[automerger skipped] DO NOT MERGE am: 5471f7ac4c -s oursXin Li
am: 96ebb11efd -s ours Change-Id: I9f5af14261a3fb543d3499f5ff2476c6f75c3d59
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: 5471f7ac4c -s ours Change-Id: I7a4818860fe7058c1dd1fdc44ef2fd65308bb93f
2018-12-07DO NOT MERGEandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I936d46c9747870f080f2553946065e6906205850
2018-06-13Allow VrCore to access tango calibration fileJiwen 'Steve' Cai
Bug: 78638290 Bug: 80530644 Test: VrCore can load device calibration. Change-Id: I153bbf0dac4d407f30d0de672a09773396537f8c
2018-06-11Add MTC specific SELinux permissions for VrCoreAkshay Joshi
Bug: 78638290 Test: boot Change-Id: I560d3907088336aff8bd43747f1a299b67a63e9f
2017-12-11Snap for 4496165 from bdc90104b414fd8caacf07eb960f1519de57f500 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I06b79e34b243a7e1abcf48760c99153861f08c5a
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: a0d1e67bcc -s ours am: 729b466fa6android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
am: 64cc8a8266 -s ours Change-Id: I8a94a4e1603c9658dfe87ef7f0ed0697d864fe68
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: a0d1e67bcc -s oursXin Li
am: 729b466fa6 Change-Id: I3c22e888fe40a83422ea5979b77dd4dedcc60a81
2017-12-07DO NOT MERGE: Merge Oreo MR1 into masterXin Li
am: a0d1e67bcc -s ours Change-Id: I8b616501dc78da2557d5c424698409690cfa5a9a
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Xin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I189778a4a1cea4446a723910716488659978f079
2017-05-17cas: remove reference to mediacasserviceoreo-mr1-devChong Zhang
bug: 22804304 Change-Id: I9d625bc1d3a7b57386c1e621db3db381e57ed52d
2017-04-28Allow VrCore to access VR HWC and Virtual Touchpad services am: 3da860ba4foreo-dr1-devDaniel Nicoara
am: 957cfc2a4e Change-Id: I1e4c7504091c059226cc94eb7d83b79fc29c75ef
2017-04-28Allow VrCore to access VR HWC and Virtual Touchpad servicesandroid-o-mr1-preview-2android-o-mr1-preview-1Daniel Nicoara
am: 3da860ba4f Change-Id: I32f31486b81dcc5ffe15531a1cb80b3552a72e0b
2017-04-20Allow VrCore to access VR HWC and Virtual Touchpad servicesandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-cts-7.1_r18android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseDaniel Nicoara
Part of the migration of VR Window Manager to VrCore, need to add necessary permissions to VrCore to interact with dependent services. Bug: 37542947 Test: Ran on device and verified no permission errors Change-Id: Id6c6f6d05fc433d9b2e86114c6e9f78834bf43ec
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 01:53:36 +0000