summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-17[automerger skipped] Add lint baseline to address NewApi errors am: ↵t_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_341510000aml_sch_331113000aml_sch_331111000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Pedro Loureiro
35dc2e1bfd am: 145a206baa am: 52cbb654f8 -s ours am: 51963cd601 -s ours am: b09f3e597c -s ours am skip reason: Merged-In Ia6e5e11dcc63f1972fff63f30542e428d208a7b9 with SHA-1 69507ee3ab is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1675515 Change-Id: I2714a4d1a2aa31b7a5e88c4b4524ecbfd44aa474
2021-04-15[automerger skipped] Add lint baseline to address NewApi errors am: ↵Pedro Loureiro
35dc2e1bfd am: 145a206baa am: 52cbb654f8 -s ours am: 51963cd601 -s ours am skip reason: skip tag Change-Id Ia6e5e11dcc63f1972fff63f30542e428d208a7b9 with SHA-1 69507ee3ab is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1675515 Change-Id: I20ce20e15440b055bbf453d0b61cd2398b314aee
2021-04-15[automerger skipped] Add lint baseline to address NewApi errors am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releasePedro Loureiro
35dc2e1bfd am: 145a206baa am: 52cbb654f8 -s ours am: 51963cd601 -s ours am skip reason: skip tag Change-Id Ia6e5e11dcc63f1972fff63f30542e428d208a7b9 with SHA-1 69507ee3ab is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1675515 Change-Id: Id28e0d343c8b1205e4a4aa77e452449faec20b28
2021-04-15[automerger skipped] Add lint baseline to address NewApi errors am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Pedro Loureiro
35dc2e1bfd am: 145a206baa am: 52cbb654f8 -s ours am skip reason: skip tag Change-Id Ia6e5e11dcc63f1972fff63f30542e428d208a7b9 with SHA-1 69507ee3ab is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1675515 Change-Id: I8e8ec2ecb762c2429e527854b9b500a8110ef8af
2021-04-15Add lint baseline to address NewApi errors am: 35dc2e1bfd am: 145a206baaPedro Loureiro
Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1675515 Change-Id: I2f0c0d5d09a184a23768592faf3f8e7c6f82c38d
2021-04-15Add lint baseline to address NewApi errors am: 35dc2e1bfdandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Pedro Loureiro
Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1675515 Change-Id: Ib84f2674cd249c72dbe756052c4d582a821b597b
2021-04-13Add lint baseline to address NewApi errorsandroid-s-beta-2android-s-beta-1Pedro Loureiro
We are enabling a new lint check where the min sdk != compile sdk. It has produced a lot of errors and adding the baseline file(s) allows us to continue work without introducing more problems. Bug: 150847901 Test: m lint-check Change-Id: Ia6e5e11dcc63f1972fff63f30542e428d208a7b9 Merged-In: Ia6e5e11dcc63f1972fff63f30542e428d208a7b9
2021-04-13Add lint baseline to address NewApi errors am: 69507ee3abPedro Loureiro
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/13709228 Change-Id: Ia7e0bd636d497f516cd8d1fc9baeb47b29f2ffa5
2021-04-12Add lint baseline to address NewApi errorsPedro Loureiro
We are enabling a new lint check where the min sdk != compile sdk. It has produced a lot of errors and adding the baseline file(s) allows us to continue work without introducing more problems. Bug: 150847901 Test: m lint-check Change-Id: Ia6e5e11dcc63f1972fff63f30542e428d208a7b9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 153f7cfb9d -s ↵Xin Li
ours am: 5cddfd81ca -s ours am: f24607f75e -s ours am skip reason: Change-Id Ie6873fc615366f3142b071e0adaf2621bd2a0f01 with SHA-1 569d1519fd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8239d85e09f1f9c378cf6668aa39bbae6bd80873
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/DevCamera am: 7293d37ce4 am: ↵Bob Badour
4f2ea8a5a6 am: 9d79f6b108 am: e5596b7d64 Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1587894 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic2f6a5e643cd3c219af3d3189db5f267f7330fcb
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 153f7cfb9d -s ↵Xin Li
ours am: 5cddfd81ca -s ours am skip reason: Change-Id Ie6873fc615366f3142b071e0adaf2621bd2a0f01 with SHA-1 569d1519fd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6415f2a258ed6a321c442da0560e8d74e09f63f
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/DevCamera am: 7293d37ce4 am: ↵Bob Badour
4f2ea8a5a6 am: 9d79f6b108 Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1587894 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17b5528749ad7ff50fe5faa0654e9980630e4b56
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 153f7cfb9d -s oursXin Li
am skip reason: Change-Id Ie6873fc615366f3142b071e0adaf2621bd2a0f01 with SHA-1 569d1519fd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I488a717b8590752f531675f968bfc3df397f525d
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ie6873fc615366f3142b071e0adaf2621bd2a0f01 Change-Id: I12a77ad414f151989fa0ac3bc869927b950ca36c
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/DevCamera am: 7293d37ce4 am: ↵Bob Badour
4f2ea8a5a6 Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1587894 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e26c54a948b1b5e06304804fc0da2f561c14470
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/DevCamera am: 7293d37ce4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1587894 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I77fb4d9bcc58d1f1f8b785506f1e100db70dfa3c
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/DevCameraBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic9414669b69226d9e2cc0603bc048fa25b2bc75b
2020-11-23Mark ab/6881855 as merged am: f366ef7bd8 am: 569d1519fdXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/13113076 Change-Id: Iee6d0259defb20c4a67d7b54d5539fdec1365e37
2020-11-23Mark ab/6881855 as merged am: f366ef7bd8Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/13113076 Change-Id: Ie6873fc615366f3142b071e0adaf2621bd2a0f01
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ic5c2f167b08b651a7e5aa10b8fd8bfef141aec21
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4a29100264 -s ours am: ↵Xin Li
dc926ca268 -s ours am: 23b7f90ab7 -s ours am skip reason: Change-Id I1ed1643a16204a677aadef2d13998b43c4eb87fe with SHA-1 532c33f3c8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/12796916 Change-Id: I00f69b6e650bca86757528b707712f97809c6a84
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4a29100264 -s ours am: ↵Xin Li
dc926ca268 -s ours am skip reason: Change-Id I1ed1643a16204a677aadef2d13998b43c4eb87fe with SHA-1 532c33f3c8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/12796916 Change-Id: I2c989955d697fbc0bd2931653e22d814a920c22f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 4a29100264 -s oursXin Li
am skip reason: Change-Id I1ed1643a16204a677aadef2d13998b43c4eb87fe with SHA-1 532c33f3c8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/12796916 Change-Id: Ica80528c7c3211961e7cc195ac9bc1603b691bff
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I1ed1643a16204a677aadef2d13998b43c4eb87fe Change-Id: I96beca07d32a0d9e46a55f3ce6786ac4e685c884
2020-09-11[automerger skipped] Merge Android R am: c22e3be8d9 -s ours am: 7ba238f85c ↵Xin Li
-s ours am: 7d85be1126 -s ours am: dd4b8057ba -s ours am: e5f8832661 -s ours am skip reason: Change-Id Ie39341cfc7031188ebc580eb751d86225b81ae93 with SHA-1 47f9a007dd is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1422453 Change-Id: I6eb62adc147ee66734873db9a0e5e6f90891c92e
2020-09-11[automerger skipped] Merge Android R am: c22e3be8d9 -s ours am: 7ba238f85c ↵Xin Li
-s ours am: 7d85be1126 -s ours am: dd4b8057ba -s ours am skip reason: Change-Id Ie39341cfc7031188ebc580eb751d86225b81ae93 with SHA-1 47f9a007dd is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1422453 Change-Id: I4a2126dd9ef04b83696fb5d1c2926e1e3a039272
2020-09-11[automerger skipped] Merge Android R am: c22e3be8d9 -s ours am: 7ba238f85c ↵Xin Li
-s ours am: 7d85be1126 -s ours am skip reason: Change-Id Ie39341cfc7031188ebc580eb751d86225b81ae93 with SHA-1 47f9a007dd is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1422453 Change-Id: I548f4066f69ae50a2de2719d0f2515d3f0d3f718
2020-09-11[automerger skipped] Merge Android R am: c22e3be8d9 -s ours am: 7ba238f85c ↵Xin Li
-s ours am skip reason: Change-Id Ie39341cfc7031188ebc580eb751d86225b81ae93 with SHA-1 47f9a007dd is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1422453 Change-Id: I9b0738c8caaaa32a39ef2c898b23a3cadbae01fe
2020-09-11[automerger skipped] Merge Android R am: c22e3be8d9 -s oursXin Li
am skip reason: Change-Id Ie39341cfc7031188ebc580eb751d86225b81ae93 with SHA-1 47f9a007dd is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/1422453 Change-Id: I6896801d6218c6772e424320410d9a3e5002c995
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ie39341cfc7031188ebc580eb751d86225b81ae93 Change-Id: I0221bf35d041903f91119578d8ffb4b8323ec3a3
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 47f9a007dd -s ours am: 6c8cb0fa90 -s ours am: 66d6e6c98a -s ours am: 762b36faa7 -s ours am skip reason: Change-Id I87b80291cb87768fba97613521d68be69d008cab with SHA-1 a51ffb7772 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/12470218 Change-Id: I0fd78c9dbbb33670188e85029f2db8b57f925eed
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 47f9a007dd -s ours am: 6c8cb0fa90 -s ours am: 66d6e6c98a -s ours am skip reason: Change-Id I87b80291cb87768fba97613521d68be69d008cab with SHA-1 a51ffb7772 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/12470218 Change-Id: Ia7e61bfd86c0cdba8df1477f8ada21397cda38e5
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 47f9a007dd -s ours am: 6c8cb0fa90 -s ours am skip reason: Change-Id I87b80291cb87768fba97613521d68be69d008cab with SHA-1 a51ffb7772 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/12470218 Change-Id: If71ffaa3256f6a726ad00631ffdcae19417221c1
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 47f9a007dd -s ours am skip reason: Change-Id I87b80291cb87768fba97613521d68be69d008cab with SHA-1 a51ffb7772 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DevCamera/+/12470218 Change-Id: I5ffe30f4550ec91bbea8c297f32c151916ba9f43
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I87b80291cb87768fba97613521d68be69d008cab Change-Id: Ie39341cfc7031188ebc580eb751d86225b81ae93
2020-05-20Add an exported flag in manifest am: a4f0902c7f am: 1b84f1f7fc am: ↵Ashwini Oruganti
a51ffb7772 am: 532c33f3c8 am: 15379861a0 Change-Id: I8d37b317f20ca4d78eb2a5c1188fbe237578e008
2020-05-20Add an exported flag in manifest am: a4f0902c7f am: 1b84f1f7fc am: ↵Ashwini Oruganti
a51ffb7772 am: 532c33f3c8 Change-Id: Ia70b231b12e9a1d3cf034fc36737dedf0849fb3a
2020-05-20Add an exported flag in manifest am: a4f0902c7f am: 1b84f1f7fc am: a51ffb7772Ashwini Oruganti
Change-Id: I1ed1643a16204a677aadef2d13998b43c4eb87fe
2020-05-20Add an exported flag in manifest am: a4f0902c7f am: 1b84f1f7fcAshwini Oruganti
Change-Id: I87b80291cb87768fba97613521d68be69d008cab
2020-05-20Add an exported flag in manifest am: a4f0902c7fandroid-r-beta-3android-r-beta-2Ashwini Oruganti
Change-Id: Ifdb9d8165b9f03a3d0cebe8a2c29d97a9dbc2711
2020-03-23Add an exported flag in manifestAshwini Oruganti
With b/150232615, we will need an explicit value set for the exported flag when intent filters are present, as the default behavior is changing for S+. This change adds the value reflecting the previous default to the manifest. These changes were made using an automated tool, the xml file may be reformatted slightly creating a larger diff. The only "real" change is the addition of "android:exported" to activities, services, and receivers that have one or more intent-filters. Bug: 150232615 Test: TH Exempt-From-Owner-Approval: mechanical refactoring Change-Id: Ie8a637dbe0ff536a719212c48d264e666e541e34
2020-01-22Add null checks when querying CaptureResultr_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_305400100Jason Lee
Bug: 148111838 Test: Ran on maran2 and flame Change-Id: I19b5a0300311a73c10696e5460ded3b4a493e56b
2019-10-18AOSP/DevCamera - Updated to sdkVersion 29. am: eec1ad2dd2 am: 237c1d8793 am: ↵Raman Tenneti
37399dce6a am: 451c252993 Change-Id: I279de763c0b4349ff01de497ba143cc8938218ed
2019-10-18AOSP/DevCamera - Updated to sdkVersion 29. am: eec1ad2dd2 am: 237c1d8793android-r-preview-4android-r-preview-3android-r-preview-2android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseRaman Tenneti
am: 37399dce6a Change-Id: I4c76513c7a60c347acaad063bcab0a472c02fc61
2019-10-18AOSP/DevCamera - Updated to sdkVersion 29. am: eec1ad2dd2Raman Tenneti
am: 237c1d8793 Change-Id: I791b9ccc1231687ff4cbfdcf28735a2e346a08af
2019-10-18AOSP/DevCamera - Updated to sdkVersion 29.android-r-preview-1Raman Tenneti
am: eec1ad2dd2 Change-Id: If51e795c05b31d19a3ecb0cfedae9d6f8b4d8f9b
2019-10-16AOSP/DevCamera - Updated to sdkVersion 29.Raman Tenneti
BUG: 133177396 Test: manual - Tested the following Pixel phone. $ make -j 40 $ make DevCamera -j $ ls -l out/target/product/marlin/system/app/DevCamera/DevCamera.apk -rw-r--r-- 1 rtenneti primarygroup 87705 Oct 16 15:21 out/target/product/marlin/system/app/DevCamera/DevCamera.apk $ adb install -r -d -g out/target/product/marlin/system/app/DevCamera/DevCamera.apk Change-Id: I8855bd9151977b25c5bc5eec70b175e3dbbcd905
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-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_r9android-10.0.0_r8android-10.0.0_r7android-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_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12ndk-sysroot-r21android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 25c16242f0 Change-Id: I05c34bffac3785efeb71bb7ca67b83763d210b7d
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I0c8c762e7b66959b8486524cc6a5539f727afc40
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 11:44:36 +0000