summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 09d3141ded -s ↵HEADt_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_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-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_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_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_r4android-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_r9android-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_r16android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10aml_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_331131000mastermain-16k-with-phonesmain-16kmainandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-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-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-releaseandroid13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-releaseaml_tz5_341510010aml_tz4_332714010Xin Li
ours am: cc33041d7f -s ours am: 779b568180 -s ours am skip reason: Change-Id I61e78751e4f7fcf90d0873362bc88d1c8a8ae9ed with SHA-1 a846dcdc14 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic43495c70c31941f37f57b112f112e87a4b0e458
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 09d3141ded -s ↵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_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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_r12android-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-devandroid12L-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-releaseandroid12-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-1Xin Li
ours am: cc33041d7f -s ours am skip reason: Change-Id I61e78751e4f7fcf90d0873362bc88d1c8a8ae9ed with SHA-1 a846dcdc14 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I87912bd1df86359988d76372b3b9e00ba870d713
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 09d3141ded -s oursXin Li
am skip reason: Change-Id I61e78751e4f7fcf90d0873362bc88d1c8a8ae9ed with SHA-1 a846dcdc14 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibce667c625e73dc10547fbfe1abe72f4210534dc
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I61e78751e4f7fcf90d0873362bc88d1c8a8ae9ed Change-Id: I01c0abc69df4299ddafb1372731fe00c870c2021
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/gps" am: 280412fab8 ↵Bob Badour
am: dbe35ae54a am: aa5261db76 am: 47b629603c Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1576127 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36c3ee652a40c32435dfb6e969655f0e7c3dbc43
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/gps" am: 280412fab8 ↵Bob Badour
am: dbe35ae54a am: aa5261db76 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1576127 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica3fe69214d2a9bcc79a4a90443caf3dc5d61842
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/gps" am: 280412fab8 ↵Bob Badour
am: dbe35ae54a Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1576127 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I03eb20b1215518cd97f460acc2c505f862decab1
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/gps" am: 280412fab8Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1576127 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifb08d0aa263e96bd3aad687ac09caabbd0673cac
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/gps"android-s-preview-1Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/gpsBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: msm8909w_3100/utils/Android.mk msm8998/utils/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: msm8909w_3100/android/Android.mk msm8998/android/Android.mk Added SPDX-license-identifier-BSD to: core/Android.mk loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk loc_api/libloc_api-rpc/Android.mk loc_api/libloc_api_50001/Android.mk msm8084/core/Android.mk msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk msm8084/loc_api/libloc_api-rpc/Android.mk msm8084/loc_api/libloc_api_50001/Android.mk msm8084/utils/Android.mk msm8909/core/Android.mk msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk msm8909/loc_api/libloc_api_50001/Android.mk msm8909/utils/Android.mk msm8909w_3100/core/Android.mk msm8909w_3100/gnss/Android.mk msm8909w_3100/location/Android.mk msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk msm8909w_3100/utils/platform_lib_abstractions/loc_stub/src/Android.mk msm8960/core/Android.mk msm8960/loc_api/libloc_api_50001/Android.mk msm8960/utils/Android.mk msm8994/core/Android.mk msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk msm8994/loc_api/libloc_api-rpc/Android.mk msm8994/loc_api/libloc_api_50001/Android.mk msm8994/utils/Android.mk msm8996/core/Android.mk msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk msm8996/loc_api/libloc_api_50001/Android.mk msm8996/utils/Android.mk msm8998/core/Android.mk msm8998/gnss/Android.mk msm8998/location/Android.mk msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk utils/Android.mk Added legacy_notice to: etc/Android.mk msm8909/etc/Android.mk msm8909w_3100/etc/Android.mk msm8960/etc/Android.mk msm8994/etc/Android.mk msm8996/etc/Android.mk msm8998/etc/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I7d0d4ef1dece1078cd2efb8ae1becc2d7aa43817
2020-11-25Mark ab/6881855 as merged am: 063c26625b am: a846dcdc14Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/13112951 Change-Id: Icb287fcdb41d85a34bda4a67fb7869426e5d146f
2020-11-25Mark ab/6881855 as merged am: 063c26625bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/13112951 Change-Id: I61e78751e4f7fcf90d0873362bc88d1c8a8ae9ed
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie992bc9923c0d5830bb9d2b5ef5d77d48eed6d23
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e8f24bd817 -s ours am: ↵Xin Li
c9e277f7cc -s ours am: dda396f6a1 -s ours am skip reason: Change-Id I3e30df368f881cdb3268e6963190f45649cbdbd6 with SHA-1 f53da2cc3b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/12796093 Change-Id: I2e47d61cfea9a1dc4e66db0219584a2a8698cd1b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e8f24bd817 -s ours am: ↵Xin Li
c9e277f7cc -s ours am skip reason: Change-Id I3e30df368f881cdb3268e6963190f45649cbdbd6 with SHA-1 f53da2cc3b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/12796093 Change-Id: I44b8b907e857886c2c989945b0cd9d6c507ae746
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e8f24bd817 -s oursXin Li
am skip reason: Change-Id I3e30df368f881cdb3268e6963190f45649cbdbd6 with SHA-1 f53da2cc3b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/12796093 Change-Id: I8480bdbb70580f327237daf0986c97e8f8b74ff4
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I3e30df368f881cdb3268e6963190f45649cbdbd6 Change-Id: Ie378ffc8221bba8c754102d2e819f3bb8d6d3900
2020-09-13fixing the location api level race condition on callbacks am: 2569796dab am: ↵Kevin Tang
41c916515e Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I0f67b02340764662e86f58dd455594fd1b507f0b
2020-09-11[automerger skipped] Merge "Merge Android R" am: fd2dce08ef -s ours am: ↵Xin Li
2b8038f348 -s ours am: 50994486d5 -s ours am: c32db0ee81 -s ours am: 0f2d2e4173 -s ours am skip reason: Change-Id Ieb1e215ffec643fcbb95c11873f0de07ebeb450b with SHA-1 d85bcd50c6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1422400 Change-Id: Id2121354c866d23581c17cede5b75924433d269d
2020-09-11[automerger skipped] Merge "Merge Android R" am: fd2dce08ef -s ours am: ↵Xin Li
2b8038f348 -s ours am: 50994486d5 -s ours am: c32db0ee81 -s ours am skip reason: Change-Id Ieb1e215ffec643fcbb95c11873f0de07ebeb450b with SHA-1 d85bcd50c6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1422400 Change-Id: I21d436b95942d1e842b37e7a932a71fe0ce48226
2020-09-11[automerger skipped] Merge "Merge Android R" am: fd2dce08ef -s ours am: ↵Xin Li
2b8038f348 -s ours am: 50994486d5 -s ours am skip reason: Change-Id Ieb1e215ffec643fcbb95c11873f0de07ebeb450b with SHA-1 d85bcd50c6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1422400 Change-Id: I7a5be6ae92f02639c743b97e818625241461c4dc
2020-09-11[automerger skipped] Merge "Merge Android R" am: fd2dce08ef -s ours am: ↵Xin Li
2b8038f348 -s ours am skip reason: Change-Id Ieb1e215ffec643fcbb95c11873f0de07ebeb450b with SHA-1 d85bcd50c6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1422400 Change-Id: I3f12bce7132236fa8bbee71fc1095b5a17157b36
2020-09-11[automerger skipped] Merge "Merge Android R" am: fd2dce08ef -s oursXin Li
am skip reason: Change-Id Ieb1e215ffec643fcbb95c11873f0de07ebeb450b with SHA-1 d85bcd50c6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1422400 Change-Id: I423861ea035f166f7035eb44d902b9b33383fdee
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ieb1e215ffec643fcbb95c11873f0de07ebeb450b Change-Id: I0df9ee9da5c3da1dd054896f9ed3acf53d084811
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d85bcd50c6 -s ours am: fa085ebc92 -s ours am: 103f8abd18 -s ours am: c8a83354e5 -s ours am skip reason: Change-Id If3a33e47082d9156a0d760849ceaae3a08be8a7d with SHA-1 01f30e42a9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/12470244 Change-Id: Iaae6f375ed73c4f81a4c0effb187b7031868c196
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d85bcd50c6 -s ours am: fa085ebc92 -s ours am: 103f8abd18 -s ours am skip reason: Change-Id If3a33e47082d9156a0d760849ceaae3a08be8a7d with SHA-1 01f30e42a9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/12470244 Change-Id: I393ae87766e902f3084048bde41b2c50ef862679
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d85bcd50c6 -s ours am: fa085ebc92 -s ours am skip reason: Change-Id If3a33e47082d9156a0d760849ceaae3a08be8a7d with SHA-1 01f30e42a9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/12470244 Change-Id: I18f96f6fede9f60706a920a2adf677e1de376391
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d85bcd50c6 -s ours am skip reason: Change-Id If3a33e47082d9156a0d760849ceaae3a08be8a7d with SHA-1 01f30e42a9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/12470244 Change-Id: Ieb5569ff51ffe77c10e1a6ef26fa5c1145a5fa1a
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: If3a33e47082d9156a0d760849ceaae3a08be8a7d Change-Id: Ieb1e215ffec643fcbb95c11873f0de07ebeb450b
2020-06-17Merge "fixing the location api level race condition on callbacks am: ↵Automerger Merge Worker
2569796dab am: 01f30e42a9 am: f53da2cc3b" into rvc-qpr-dev-plus-aosp am: b41552f16f Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I5a559238e409e375265fce5f60ac94b00480f136
2020-06-17fixing the location api level race condition on callbacks am: 2569796dab am: ↵Kevin Tang
367bfcbc62 am: ca6519d781 am: 2b6b23c112 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I75dca61f6b89bd46f4e5c8820f74bca5e08c7b28
2020-06-17fixing the location api level race condition on callbacks am: 2569796dab am: ↵Kevin Tang
367bfcbc62 am: a01ebc682f am: f7d5ce55c3 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I7c1f1b62e4230e936775359a25d03fee6c8d01d1
2020-06-17Merge "fixing the location api level race condition on callbacks am: ↵Automerger Merge Worker
2569796dab am: 01f30e42a9 am: f53da2cc3b" into rvc-qpr-dev-plus-aosp
2020-06-17fixing the location api level race condition on callbacks am: 2569796dab am: ↵Kevin Tang
01f30e42a9 am: f53da2cc3b Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I2a046a46e2de01fb0ce2e76c41aebee8d892b779
2020-06-17fixing the location api level race condition on callbacks am: 2569796dab am: ↵Kevin Tang
367bfcbc62 am: ca6519d781 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: Ie32c8f5519be447a62dcb40a733702e69da7b760
2020-06-17fixing the location api level race condition on callbacks am: 2569796dab am: ↵Kevin Tang
367bfcbc62 am: a01ebc682f Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I48ca53a22c15bf97fbaa8bca38d4148821cd5541
2020-06-17fixing the location api level race condition on callbacks am: 2569796dab am: ↵Kevin Tang
01f30e42a9 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I3e30df368f881cdb3268e6963190f45649cbdbd6
2020-06-17fixing the location api level race condition on callbacks am: 2569796dab am: ↵android-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_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-releaseKevin Tang
367bfcbc62 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I0e45ccd73f2e6ae9a6da84ced6157276156665d5
2020-06-17fixing the location api level race condition on callbacks am: 2569796dab am: ↵Kevin Tang
367bfcbc62 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: If0390c699a46023b1f5ff88810cd3e9b83596efc
2020-06-17fixing the location api level race condition on callbacks am: 2569796dabandroid-mainline-12.0.0_r112android-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_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-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-releaseaml_tz2_305400100Kevin Tang
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: Ie286e12ff5a7de9b3e96876b2d97b60112a8276f
2020-06-17fixing the location api level race condition on callbacks am: 2569796dabandroid-11.0.0_r16android11-d1-b-releaseKevin Tang
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: I72d2018ba26188de885fb8ed729a6b348b0a11b0
2020-06-17fixing the location api level race condition on callbacks am: 2569796dabKevin Tang
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/gps/+/11859958 Change-Id: If3a33e47082d9156a0d760849ceaae3a08be8a7d
2020-06-13fixing the location api level race condition on callbacksandroid11-devKevin Tang
At the layer right under HIDL impl, where the callback objs are received from HIDL and used by HAL layer, there is race condition volnerability which could yield using a incompletely copied sp obj. Added mutex protection. Change-Id: I611db590d1fadbe43c74db71a1ea906dbe067c6d CRs-Fixed: 2144976 Bug: 129282808 Signed-off-by: Harrison Lingren <hlingren@google.com> Change-Id: I15ead5e2502b8b6455441a07e00293591f0f2fd4
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
75acba49ec -s ours am: d75619075d -s ours am: 3e8b9f0531 -s ours am: a374620876 -s ours am: eb61530b92 -s ours am skip reason: Change-Id I2428f78ab3867a99ff2ee34173b21f451269398a with SHA-1 c4203989b1 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1323620 Change-Id: I8f3c7599c0b11e9daa78462dec1051a290496324
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
75acba49ec -s ours am: d75619075d -s ours am: 3e8b9f0531 -s ours am: a374620876 -s ours am skip reason: Change-Id I2428f78ab3867a99ff2ee34173b21f451269398a with SHA-1 c4203989b1 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1323620 Change-Id: Ie8d53f61eb7aae996f536476ee683f4b3c61c795
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
75acba49ec -s ours am: d75619075d -s ours am: 3e8b9f0531 -s ours am skip reason: Change-Id I2428f78ab3867a99ff2ee34173b21f451269398a with SHA-1 c4203989b1 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1323620 Change-Id: I9d31fa3717a077084dc28f898a1dc268932acbce
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
75acba49ec -s ours am: d75619075d -s ours am skip reason: Change-Id I2428f78ab3867a99ff2ee34173b21f451269398a with SHA-1 c4203989b1 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1323620 Change-Id: I9f18805dc757b70a47eabf67f69170400057e5b0
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
75acba49ec -s ours am skip reason: Change-Id I2428f78ab3867a99ff2ee34173b21f451269398a with SHA-1 c4203989b1 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/gps/+/1323620 Change-Id: I477e326a40cd8e5828d07f05c69f53f311d1cdc6
2020-06-06Merge "Merge QQ3A.200605.002 into master"android-r-beta-3android-r-beta-2Xin Li
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 04:01:05 +0000