summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add the 'bdev_type' attribute to all block device typesHEADandroid-s-beta-5masterandroid-s-beta-5Bart Van Assche2021-08-241-43/+43
* SEPolicy: Merge folder non_plat and r_non_platShanshan Guo2021-08-24154-10690/+0
* add aee_aedv selinux rulesChao Peng2021-08-241-0/+1
* SEPolicy: Add context for /dev/radioShanshan Guo2021-08-242-2/+2
* Fix SD Card device typeHoward Chen2021-08-243-4/+3
* Allow binder services to r/w su:tcp_socket am: d030ad6b1candroid-s-beta-4android-s-beta-3android-s-beta-4Yifan Hong2021-06-081-1/+2
|\
| * Allow binder services to r/w su:tcp_socketYifan Hong2021-06-081-1/+2
* | Fix OWNERS am: ce9e9e3272Greg Kaiser2021-06-081-1/+4
|\|
| * Fix OWNERSGreg Kaiser2021-06-081-1/+4
|/
* Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li2021-02-200-0/+0
|\
| * [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: cbca3f5627 -s ou...Xin Li2020-12-100-0/+0
| |\ | |/ |/|
* | [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: cbca3f5627 -s oursXin Li2020-12-100-0/+0
|\ \
| * \ DO NOT MERGE - Merge Android R QPR1android-s-preview-1Xin Li2020-12-084-4/+4
| |\ \ | |/ / |/| |
| | * [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 4...Xin Li2020-12-030-0/+0
| | |\ | |_|/ |/| |
* | | Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li2020-11-234-4/+4
|\ \ \
| | | * Comment out ro.system.build.fingerprint am: cc3ddcc730 am: d78af6fd0f am: 1b7...Inseob Kim2020-11-041-1/+2
| | |/| | |/| |
| | | * Comment out ro.system.build.fingerprint am: cc3ddcc730 am: d78af6fd0fInseob Kim2020-11-041-1/+2
| | | |\ | |_|_|/ |/| | |
* | | | Comment out ro.system.build.fingerprint am: cc3ddcc730Inseob Kim2020-11-041-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Comment out ro.system.build.fingerprintInseob Kim2020-11-041-1/+2
|/ / /
| * | Rename exported3_radio_prop to radio_control_prop am: 9da843d262 am: 51786b8d34Inseob Kim2020-08-014-4/+4
| |\|
| | * Rename exported3_radio_prop to radio_control_prop am: 9da843d262Inseob Kim2020-08-014-4/+4
| | |\
| | | * Rename exported3_radio_prop to radio_control_propInseob Kim2020-07-284-4/+4
| |_|/ |/| |
| * | Rename system_radio_prop am: 050ce88407 am: e45eeb15d7Inseob Kim2020-05-157-12/+10
| |\|
| | * Rename system_radio_prop am: 050ce88407Inseob Kim2020-05-157-12/+10
| | |\ | |_|/ |/| |
* | | Rename system_radio_propplatform-tools-30.0.5Inseob Kim2020-05-147-12/+10
| * | Change exported_fingerprint_prop to fingerprint_prop am: 1418fb4332 am: 439a4...Inseob Kim2020-05-121-1/+1
| |\|
| | * Change exported_fingerprint_prop to fingerprint_prop am: 1418fb4332Inseob Kim2020-05-121-1/+1
| | |\ | |_|/ |/| |
* | | Change exported_fingerprint_prop to fingerprint_propInseob Kim2020-05-111-1/+1
| * | Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am: 1a824b...Greg Kaiser2020-04-020-0/+0
| |\ \
| | * \ Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am: 1a824b...Greg Kaiser2020-04-0238-704/+726
| | |\ \
| | | * | Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am: 1a824b...android-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_r18android11-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-d2-releaseGreg Kaiser2020-04-0238-704/+726
| | |/| |
| * | | | Merge "Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am:...Automerger Merge Worker2020-04-020-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am:...Automerger Merge Worker2020-04-020-0/+0
| | |\ \ \
| | | * \ \ Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am: edcdbb...Greg Kaiser2020-04-0238-704/+726
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bbGreg Kaiser2020-04-0238-704/+726
|\ \ \ \ \ \
| | * | | | | Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am: 1a824b...Greg Kaiser2020-04-0238-704/+726
| | |\| | | |
| | | * | | | Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb am: 1a824b...Greg Kaiser2020-04-0238-704/+726
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/|
| | | | * | Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bbandroid-11.0.0_r16android11-d1-b-releaseGreg Kaiser2020-04-0238-704/+726
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Automated merge of MTK Keystone code for 2020_03_30android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-devGreg Kaiser2020-03-3038-704/+726
| |\ \ \ \ \
| | * \ \ \ \ Merge "[ALPS05003224] thermal hal service sepolicy" into alps-trunk-r0.mssiHenry Huang2020-03-112-0/+9
| | |\ \ \ \ \
| | | * | | | | [ALPS05003224] thermal hal service sepolicyhenry huang2020-03-112-0/+9
| | * | | | | | [ALPS04958679] EM:remove phone UIDyuhui.zhang2020-03-103-158/+6
| | * | | | | | Merge "[ALPS04991295] relable aee_aed/aee_aed64 to crash_dump" into alps-trun...Larry Liang2020-03-1017-218/+206
| | |\ \ \ \ \ \
| | | * | | | | | [ALPS04991295] relable aee_aed/aee_aed64 to crash_dumpmtk112852020-03-0917-218/+206
| | | |/ / / / /
| | * / / / / / [ALPS05025613] SEPolicy: Modify neverallow rule for system_data_fileShanshan Guo2020-03-072-239/+239
| | |/ / / / /
| | * | | | | Merge "[ALPS04975618] add aee hidl service" into alps-trunk-r0.mssiLarry Liang2020-03-067-4/+16
| | |\ \ \ \ \
| | | * | | | | [ALPS04975618] add aee hidl serviceHuaiming Li2020-03-047-4/+16
| | * | | | | | Merge "[ALPS05014766] SEPolicy: Modify property with new attributes" into alp...Shanshan Guo2020-03-055-372/+306
| | |\ \ \ \ \ \
| | | * | | | | | [ALPS05014766] SEPolicy: Modify property with new attributesShanshan Guo2020-03-055-372/+306
| | | |/ / / / /
| | * / / / / / [ALPS04890169] RTC: add permission for system_serverandrew.yang2020-03-041-0/+1
| | |/ / / / /