summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'oc-dr1-daydream-dev' into goog/qt-devandroid-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' Cai2019-06-191-0/+16
|\ | | | | | | | | | | am: d1b4c07768 Change-Id: I9ce5c29f5dafd67a0f955be7670c3fc8052e38a6
| * Merge branch 'oc-dr1-daydream-dev' into goog/qt-devandroid10-devJiwen 'Steve' Cai2019-06-131-0/+16
|/| | | | | | | | | | | Bug: 135069613 Test: just merge the branch, nothing works yet Change-Id: Ifd33b9cbb3a2c77e9dd855d628798cb71a0393bc
| * Allow VrCore to access tango calibration fileJiwen 'Steve' Cai2018-06-131-0/+3
| | | | | | | | | | | | | | Bug: 78638290 Bug: 80530644 Test: VrCore can load device calibration. Change-Id: I153bbf0dac4d407f30d0de672a09773396537f8c
| * Add MTC specific SELinux permissions for VrCoreAkshay Joshi2018-06-111-0/+13
| | | | | | | | | | | | Bug: 78638290 Test: boot Change-Id: I560d3907088336aff8bd43747f1a299b67a63e9f
* | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-240-0/+0
|\ \ | | | | | | | | | | | | | | | | | | am: 719ecaf028 -s ours am skip reason: subject contains skip directive Change-Id: I804c5ed88bb11421826d4ceb564b24a0c0e227b1
| * \ DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\ \ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: Ib71e08446ec775d04001c6ed52a8a46b958e72a0
* | | | vrcore_app: add tmpfs type.Jeff Vander Stoep2019-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ERROR 'unknown type vrcore_app_tmpfs' at token ';' on line 51956: Bug: 122854450 Test: build walleye_xr-userdebug Change-Id: I71277993bb7edae94a3ca4026fb8e6427340ebac
* | | | [automerger skipped] DO NOT MERGE am: 5471f7ac4c -s ours am: 96ebb11efd -s ↵Xin Li2018-12-100-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | ours am: f293cecabf -s ours Change-Id: I85b4c0445ee657297f911a8945c31b2e031ef450
| * | | [automerger skipped] DO NOT MERGE am: 5471f7ac4c -s oursXin Li2018-12-100-0/+0
|/| | | | |/ / | | | | | | | | | | | | am: 96ebb11efd -s ours Change-Id: I9f5af14261a3fb543d3499f5ff2476c6f75c3d59
| * | [automerger skipped] DO NOT MERGEXin Li2018-12-100-0/+0
|/| | | | | | | | | | | | | | | | | am: 5471f7ac4c -s ours Change-Id: I7a4818860fe7058c1dd1fdc44ef2fd65308bb93f
| * | DO 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 Li2018-12-070-0/+0
|/| | | | | | | | | | | | | | | | | | | | Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I936d46c9747870f080f2553946065e6906205850
| * | Snap 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_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_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_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_r2android-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 Robot2017-12-110-0/+0
| |\ \ | |/ / |/| | | | | Change-Id: I06b79e34b243a7e1abcf48760c99153861f08c5a
* | | DO 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-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-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 Li2017-12-070-0/+0
|\ \ \ | |/ / |/| | | | | | | | | | | am: 64cc8a8266 -s ours Change-Id: I8a94a4e1603c9658dfe87ef7f0ed0697d864fe68
| * | DO NOT MERGE: Merge Oreo MR1 into master am: a0d1e67bcc -s oursXin Li2017-12-070-0/+0
|/| | | | | | | | | | | | | | | | | am: 729b466fa6 Change-Id: I3c22e888fe40a83422ea5979b77dd4dedcc60a81
| * | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-070-0/+0
|/| | | | | | | | | | | | | | | | | am: a0d1e67bcc -s ours Change-Id: I8b616501dc78da2557d5c424698409690cfa5a9a
| * | DO 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 Li2017-12-061-1/+0
| |\ \ | |/ / |/| / | |/ | | Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I189778a4a1cea4446a723910716488659978f079
* / cas: remove reference to mediacasserviceoreo-mr1-devChong Zhang2017-05-171-1/+0
|/ | | | | bug: 22804304 Change-Id: I9d625bc1d3a7b57386c1e621db3db381e57ed52d
* Allow VrCore to access VR HWC and Virtual Touchpad services am: 3da860ba4foreo-dr1-devDaniel Nicoara2017-04-282-0/+5
|\ | | | | | | | | | | am: 957cfc2a4e Change-Id: I1e4c7504091c059226cc94eb7d83b79fc29c75ef
| * Allow VrCore to access VR HWC and Virtual Touchpad servicesandroid-o-mr1-preview-2android-o-mr1-preview-1Daniel Nicoara2017-04-282-0/+5
| |\ | | | | | | | | | | | | | | | am: 3da860ba4f Change-Id: I32f31486b81dcc5ffe15531a1cb80b3552a72e0b
| | * Allow 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 Nicoara2017-04-202-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Change levelFrom=all to levelFrom=user am: 1da868148dNick Bray2017-04-181-2/+2
|\| | | | | | | | | | | | | | | | | am: e05ba1a3ca Change-Id: I089f7155940de0b48a58fc0171140c0fca46e772
| * | Change levelFrom=all to levelFrom=userNick Bray2017-04-181-2/+2
| |\| | | | | | | | | | | | | | | | am: 1da868148d Change-Id: Id4aec772b5022645628597f4c1b7482b91541fac
| | * Change levelFrom=all to levelFrom=userNick Bray2017-04-171-2/+2
| |/ | | | | | | | | | | | | | | | | VrCore was trying to access .../com.google.android.gms/app_chimera, and this was causing an avc denial due to multi-level security. Bug: 36367417 Test: can pair controler Change-Id: I5b79dc279f099a29bc1957110fa8bea1cdcd652c
* | App-specific SELinux domain for VrCore.Nick Bray2017-04-177-0/+129
|\| | | | | | | | | | | am: 850f8473e5 Change-Id: If28a9cbdec48ddb2bb18d6dd3d994e56039a5528
| * App-specific SELinux domain for VrCore.Nick Bray2017-04-077-0/+129
|/ | | | | | | | | Move VrCore from untrusted_app_25 into its own domain so we can have finer control of its IPC surface. Bug: 36367417 Test: manual Change-Id: Ib02a58a0a45b7b86c05e3e585437b2f9d68687fe
* Initial empty repositorykuantung2017-03-310-0/+0