summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-16Add new images for the overlay of safety and regulatoryandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-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-releaseYanting Yang
We have to define all used images in SafetyRegulatoryInfo, otherwise these new images are not able to show on regulatory manual page. Bug: 130313512 Test: visual Change-Id: I23da69fce2ff62abb09ce9e8f8de467d6179154d
2019-06-04Define two files of safety and regulatory for overlay.tmfang
am: f002de47c0 Change-Id: If00af08023f095aa87099010b464412d714ffb1e
2019-06-03Define two files of safety and regulatory for overlay.android10-devtmfang
Without the files defined here, the res will not able to be found which led to ClassNotFoundException. Test: visual Bug: 134165112 Change-Id: Icd7a2d7e8e94f098ac1a1c16b16f3faacda31b9b
2019-04-18Define some files of safety and regulatory for overlay.Yi-Ling Chuang
Without the files defined here, the res will not able to be found which led to ClassNotFoundException. Fixes: 130690277 Test: manual Change-Id: If25a4cf448b8206904dbc7aaccca8ae5b95bcc5f
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 35270ef3ba Change-Id: Ibb8f31291211399160bea3362430b42db4cb12fa
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I566b58665c810cb14b96aa2b7ef3835e3d53984e
2019-02-21[automerger skipped] Import translations. DO NOT MERGE am: 17117458d1 -s oursBill Yi
am: 608d7391fe -s ours am skip reason: subject contains skip directive Change-Id: Ib4f96d17663c1bb67a3a9058e011cc8aa52197a6
2019-02-21[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 17117458d1 -s ours am skip reason: subject contains skip directive Change-Id: Ib02917bbd1b78a578d2d20949997d2a0b354d219
2019-02-21Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: If48fb7e4f6a53d60395e157387debb07107c4bc7
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Iffadcb733dfe5e268c4272a76214f890318f2f87
2019-02-02Import translations. DO NOT MERGEBill Yi
Change-Id: I25262676f0833934a9ad0fb017e96aa370729788 Auto-generated-cl: translation import
2019-01-22Add default code reviewers into OWNERS am: a755736590 am: f285844d81Chih-Hung Hsieh
am: 645906662b Change-Id: Ib8fab6d80a825639896a46d2663718f36d31344e
2019-01-22Add default code reviewers into OWNERS am: a755736590Chih-Hung Hsieh
am: f285844d81 Change-Id: Id775f64a018a93d872bf0244bb17464664951d44
2019-01-22Add default code reviewers into OWNERSChih-Hung Hsieh
am: a755736590 Change-Id: Ic2d8b80c0179cf86d9e7bf0dc7b43c1b43d30a7c
2019-01-18Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ib1760fbbac83df7fd936b89364b65ce7c588e08d
2019-01-11Convert Android.mk file to Android.bp am: 844f4227ee am: 33fa14721bSasha Smundak
am: 49bd12d2e3 Change-Id: I3ff56917d48377b616a4404e79f86b07597a5a4e
2019-01-11Convert Android.mk file to Android.bp am: 844f4227eeSasha Smundak
am: 33fa14721b Change-Id: I7f0ce38ac5fe820fb94e8dacfb7ba9ea7d718736
2019-01-11Convert Android.mk file to Android.bpSasha Smundak
am: 844f4227ee Change-Id: Id07c7e6ebf2eb66ec09fdc20b3ad5c16945669bf
2019-01-11Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Change-Id: I838f3906c46dc5e50cd57a0f625275fa8619bc8c Fixes: 122332858 Test: treehugger
2018-12-13AOSP/SafetyRegulatoryInfo - update the SafetyRegulatoryInfo test package ↵Raman Tenneti
version to target P (28) or higher. am: 8a18edf034 am: feae288298 am: 360941c1bf Change-Id: I5522e0e9b1f0615e8bbf7f31b9df19184cb22042
2018-12-13AOSP/SafetyRegulatoryInfo - update the SafetyRegulatoryInfo test package ↵Raman Tenneti
version to target P (28) or higher. am: 8a18edf034 am: feae288298 Change-Id: I949d88e27c4ffbb416aa8c38a8976d6460d87523
2018-12-13AOSP/SafetyRegulatoryInfo - update the SafetyRegulatoryInfo test package ↵Raman Tenneti
version to target P (28) or higher. am: 8a18edf034 Change-Id: I7e2c9aa333c950e544e9ff89d485775a6995efba
2018-12-13AOSP/SafetyRegulatoryInfo - update the SafetyRegulatoryInfo test package ↵android-o-mr1-iot-release-1.0.8Raman Tenneti
version to target P (28) or higher. Bug: 115499280 Test: manual - Ran the following tests on Pixel phone. Tested the SafetyRegulatoryInfo manually. $ make SafetyRegulatoryInfo -j -rw-r--r-- 1 rtenneti primarygroup 29256 Dec 12 16:12 out/target/product/marlin/system/app/SafetyRegulatoryInfo/SafetyRegulatoryInfo.apk $ fastboot flashall -w to install the package and tested Safety and Regulatory manual in "System" -> "About Phone". Change-Id: Ie7dd9f03d404f170b85a955e4e9c2fc2ace0a852
2018-10-25Merge "Update target SDK from 23 to 28"TreeHugger Robot
2018-10-25Update target SDK from 23 to 28Edgar Wang
Bug:117829740 Test: rebuild & manual Change-Id: I3af81007bb9c57fe720edf619f410acc6180ee75
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 7d4614c646 -s ours am: 303cafdc7d -s ours am: 29003b8612 -s ours Change-Id: I7e9b38b5427a1c6b5fe2747baf579b73ef3698f8
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 7d4614c646 -s ours am: 303cafdc7d -s ours Change-Id: I35980e20dfa6558ef2cdb7dcc28f5c0a18af9844
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 7d4614c646 -s ours Change-Id: I0dfc19514a28e5e22c89ef9be5e2fd332a5b30d8
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-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-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.7Bill Yi
Change-Id: I05d222f347bbcd482b852be3c52453bb4dbf2216
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 67a89fe495 -s ours am: e22d3de5f5 -s ours Change-Id: Icaee31f2d149d159e20085fb40f4de28c487b92f
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 67a89fe495 -s ours Change-Id: I4c9be4a1f31c6a5bc22e6020a787ef17e9176a1f
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ie83e7cb858b75a2be2dcd5dd10ab12d10a0ecf5a
2018-08-08Merge Android Pie into master am: a7feaf57d4 am: 1fe13adb13 am: ad08c5cf11Xin Li
am: a7a0573ea8 Change-Id: I5c311072c9fa3f10668ae073cedecd2446d410ab
2018-08-07Merge Android Pie into master am: a7feaf57d4 am: 1fe13adb13Xin Li
am: ad08c5cf11 Change-Id: Iab103165cd6f9af8b5ef871ff247984e774badc4
2018-08-07Merge Android Pie into master am: a7feaf57d4Xin Li
am: 1fe13adb13 Change-Id: Id26d68a9fe9967357bb90f72024293133c51fd64
2018-08-07Merge Android Pie into masterXin Li
am: a7feaf57d4 Change-Id: I7331fcd45ce370c306449785db7ee68e7d9367f6
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
Bug: 112104996 Change-Id: I2e8e55d6a1dab733f69220053bd6a075450f25ff
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 6c1117b7a1Xin Li
am: 1a56fc24bf Change-Id: I879af42fef5a7cec7412fd02605c1188f0b169ff
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 6c1117b7a1 Change-Id: I2c520d3b25bd5227dbbbc1864da0e65c92c1bf97
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I6587923146ead493310847c8b7f21ca86ff74887
2018-03-08Import translations. DO NOT MERGEBill Yi
Change-Id: Ib278e1d3360b8cf9b3101cc44e70f5bc09ab67cc Auto-generated-cl: translation import
2018-03-07Snap for 4638586 from 0a8366239cefa858b4d2855717854315a39d7022 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-cts-releaseandroid-build-team Robot
Change-Id: I8b7953c3cb94ee97948cb3c57bbdcd493033be42
2018-03-07Import translations. DO NOT MERGE am: 0a8366239c -s oursBill Yi
am: 222d3cca96 -s ours Change-Id: I57d86822300297794019f4ddeb51875476a7607d
2018-03-06Import translations. DO NOT MERGEBill Yi
am: 0a8366239c -s ours Change-Id: Ib292063b4ad1efca237de85b51b186198d888b82
2018-03-06Import translations. DO NOT MERGEandroid-9.0.0_r39android-9.0.0_r38android-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-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devBill Yi
Change-Id: I43fd7051a499b8b49b0638217013d4394d1f8af5 Auto-generated-cl: translation import
2018-02-25Snap for 4620899 from 64c3207a3b977390e9d149e322e580e257dd1259 to pi-releaseandroid-build-team Robot
Change-Id: I497d88f5dcdeab3336dfade0f837885e995b4fb6
2018-02-22packages/apps/SafetyRegulatoryInfo: Set LOCAL_SDK_VERSION where possible. ↵Anton Hansson
am: 3e5bd08e3f am: 7171edefb3 am: 2db873d4c6 Change-Id: I63bf9f0fafcd28e2f5a3ee4cdea3c4c84397a6d3
2018-02-22packages/apps/SafetyRegulatoryInfo: Set LOCAL_SDK_VERSION where possible. ↵Anton Hansson
am: 3e5bd08e3f am: 7171edefb3 Change-Id: I8fc7e0df54b926f4ce593e0f17a9f42f283e38d7
2018-02-22packages/apps/SafetyRegulatoryInfo: Set LOCAL_SDK_VERSION where possible.Anton Hansson
am: 3e5bd08e3f Change-Id: I8fb4d15f398bdeed148533d17f26d41f5806fdff
2018-02-22packages/apps/SafetyRegulatoryInfo: Set LOCAL_SDK_VERSION where possible.android-wear-p-preview-2android-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-7Anton Hansson
This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: Ia9fae463164dc2b25be5076c2a2a916d76de694a