summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I02c9eb59eabf16a5b862ae78670d31db6e1fc15f Change-Id: I99658fca1f094ca57dc843a5fccd7e28e39eaa06
2023-04-13docs: Fixing typos in doc commentsandroid14-devAndrew Solovay
Need to make some doc edits to verify our instructions for making reference doc fixes, so I ran the common_typos linter to identify some fixes to make. Only typo fixes, no meaningful changes to doc content (and no changes to code). Still worth making these changes, since the typos linter will raise warnings every time we try to publish updated docs. Bug: 278120741 Change-Id: I02c9eb59eabf16a5b862ae78670d31db6e1fc15f Test: [ABTD docs build: https://android-build.googleplex.com/builds/abtd/run/L39300000959916024]
2023-02-18Set logging for SipAudioCall to FALSE.Tyler Gunn
This prevents potentially logging pii related to SIP. Test: Manual test. Fixes: 233606950 Change-Id: I93ffc133f4f4338d99ba625f17b96fe01c2284f7
2022-10-04Add unaudited exported flag to exposed runtime receiversMichael Groover
Android T allows apps to declare a runtime receiver as not exported by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag; receivers registered with this flag will only receive broadcasts from the platform and the app itself. However to ensure developers can properly protect their receivers, all apps targeting U or later registering a receiver for non-system broadcasts must specify either the exported or not exported flag when invoking #registerReceiver; if one of these flags is not provided, the platform will throw a SecurityException. This commit updates all the exposed receivers with a new RECEIVER_EXPORTED_UNAUDITED flag to maintain the existing behavior of exporting the receiver while also flagging the receiver for audit before the U release. Bug: 234659204 Test: Build Change-Id: Ie64de4dfa3dbe20e389539be1ba4105eb789b3ef
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 18132dcad5 ↵Xin Li
-s ours am: 6f6a3c4d93 -s ours am: c42d47c18e -s ours am: b61b148c40 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749 Change-Id: I299b13076118906203eee237ceafe41d82b5267e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8ea1d3ceb4 -s ours ↵Xin Li
am: 14aa414833 -s ours am: b9be3bdce3 -s ours am: da18ed0e4f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749 Change-Id: Ibed0b7e7b8fa14c13565bfce98d3b9cd21a261b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 18132dcad5 ↵android-u-beta-1-gplmain-16k-with-phonesXin Li
-s ours am: 6f6a3c4d93 -s ours am: c42d47c18e -s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749 Change-Id: Ia5d810bae88de80e9999ce4d183bc9a112937d18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8ea1d3ceb4 -s ours ↵Xin Li
am: 14aa414833 -s ours am: b9be3bdce3 -s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749 Change-Id: I837deab54a62c15cacef48e85e227e30eaed30f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 18132dcad5 ↵Xin Li
-s ours am: 6f6a3c4d93 -s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749 Change-Id: I86e559574a332ae6d0c7be5ebfbe3c73c2b40c2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8ea1d3ceb4 -s ours ↵Xin Li
am: 14aa414833 -s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749 Change-Id: Ie9611ab73bc62f651f457d18b43723093ceca07b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 18132dcad5 ↵Xin Li
-s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749 Change-Id: Ib534b99fb15e25d154c1101770eca9e27f96321e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8ea1d3ceb4 -s oursXin Li
am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749 Change-Id: Ibeca1b1f96321469487e90775d11d11977cce1b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16Merge "DO NOT MERGE - Merge Android 13"main-16kXin Li
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: If930fd561557531d52fb1b2b0e8563515d7a69ff Change-Id: Ie7d9c2f7322241480c0e71ad9757efadf4f62044
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fc695ac703 -s ours am: 655b6432fb -s ours am: 717b79094e -s ours am: e9e45a5df9 -s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/19093218 Change-Id: I4dfa85f266a555b3bb73e7dbd76c71dd56a9af6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fc695ac703 -s ours am: 655b6432fb -s ours am: 717b79094e -s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/19093218 Change-Id: I6cf1561c3bed81c1a9796943f2a3c2d4b2c90b5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fc695ac703 -s ours am: 655b6432fb -s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/19093218 Change-Id: I71f1d444f6ce902b058bfdb0b9f4b499a60ea29c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
fc695ac703 -s ours am skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/19093218 Change-Id: I1a879723bfd4082bdcda5e755c0923073f40f9a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940Xin Li
Bug: 236760014 Merged-In: If930fd561557531d52fb1b2b0e8563515d7a69ff Change-Id: Iecfcf430e3219382180c1a6a78ded10cd50f77fe
2022-05-17Update AudioEffect caller to new interfaceAtneya Nair
Test: Compiles Bug: 199156212 Change-Id: I55def4d5eda53f0e6867d882ff099d31f931fccd
2022-02-14Merge "Update AudioTrack/Record buffer interface"t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-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_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_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_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-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-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-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Atneya Nair
2022-02-07Update AudioTrack/Record buffer interfaceAtneya Nair
Test: Compiles Bug: 216175830 Change-Id: If930fd561557531d52fb1b2b0e8563515d7a69ff
2022-01-26Update AudioGroup to call new AudioTrack/Rec setAtneya Nair
Test: Compiles Bug: 199156212 Change-Id: I5d33e138716e304feace6c9be276a5a55ca61c63
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ↵Xin Li
ba3fe43201 -s ours am: b3aa668458 -s ours am: 49668fcb0e -s ours am: cd9afb673e -s ours am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378 Change-Id: Ie098fba96fbe645ed41f187b3b5de1eb46d73b20
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ↵Xin Li
ba3fe43201 -s ours am: b3aa668458 -s ours am: 49668fcb0e -s ours am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378 Change-Id: I853dd4d059492ffaac61ef4fd9c8ed0143ecb284
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ba3fe43201 -s ours am: b3aa668458 -s ours am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378 Change-Id: I8f7b5f08864b631733d38a880cd2b87d6b8258d7
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ↵Xin Li
ba3fe43201 -s ours am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378 Change-Id: I6d9b2458619b757c3b3f2768d686b83192663fa6
2021-10-08[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s oursXin Li
am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378 Change-Id: I42ee571e8120ae258630b8b09f372f155e1cb79e
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e Change-Id: Ia6369c6e114a1212de7bf9c3b09448d3b747e1b6
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a1de4c6517 -s ours am: 883e10b6eb -s ours am: df427d2297 -s ours am: bdfd9b4a76 -s ours am skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807 Change-Id: I4363495fd3ad12b5d071a183c347a394608e34d8
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a1de4c6517 -s ours am: 883e10b6eb -s ours am: df427d2297 -s ours am skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807 Change-Id: I8e1b5e426a3e75275918dcb58d211041e24ed439
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a1de4c6517 -s ours am: 883e10b6eb -s ours am skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807 Change-Id: Ic4878c98a53221989c4d7bcdaf4bbdcfc780cfa8
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
a1de4c6517 -s ours am skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807 Change-Id: I893c2b6c91eae5b02f6830ef3194d71dfc43cc13
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Ida30b3f19b975f65b66ef39540dd45c460911b53 Change-Id: I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e
2021-06-21[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: ↵Xin Li
c08addd878 -s ours am: 5ef5b9278f -s ours am: f36a184648 -s ours am: 30a9090c7c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481 Change-Id: I851f8043806e5a151703a1e7acda9007bf0d866f
2021-06-21[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: ↵Xin Li
c08addd878 -s ours am: 5ef5b9278f -s ours am: f36a184648 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481 Change-Id: Ibfba967ae1dd7d17fad2f843c20679169b010d17
2021-06-21[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: ↵Xin Li
c08addd878 -s ours am: 5ef5b9278f -s ours am skip reason: Merged-In Ia8161dc461f79edacbc59a3b0e09323d1d4508c7 with SHA-1 c21e847348 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481 Change-Id: Ida30b3f19b975f65b66ef39540dd45c460911b53
2021-06-21[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: ↵Xin Li
c08addd878 -s ours am skip reason: Merged-In Ia8161dc461f79edacbc59a3b0e09323d1d4508c7 with SHA-1 c21e847348 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481 Change-Id: Ie980435af6796a0e9045e4755e601ea67865bd69
2021-06-21Merge "DO NOT MERGE - Merge RQ3A.210605.005"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
2021-06-18DO NOT MERGE - Merge RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: Ia8161dc461f79edacbc59a3b0e09323d1d4508c7 Change-Id: I6f82b47ce0238178179681c918cecaedb733e18d
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
c21e847348 -s ours am: 3e6f48b1db -s ours am: 8749a3714c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15023960 Change-Id: I9e3e0e9d494359d74b3a610504f2b34a12808ea8
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
c21e847348 -s ours am: 3e6f48b1db -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15023960 Change-Id: I826c5d04ce36686d8e3eed6ef41447e7ad0c1260
2021-06-18[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ↵Xin Li
c21e847348 -s ours am skip reason: Merged-In Ic06907b897166d632b67dac8151b3cd62e5e4c20 with SHA-1 35022088c6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15023960 Change-Id: Ia57d190c54cc932ae074c8ae9fdd86141face275
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: Ic06907b897166d632b67dac8151b3cd62e5e4c20 Change-Id: Ia8161dc461f79edacbc59a3b0e09323d1d4508c7
2021-06-18[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours ↵Xin Li
am: c8f602d4d0 -s ours am: 6a14b5344e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14974087 Change-Id: I4697b590153258486493ea46ba5cf1a07a3ded67
2021-06-18[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours ↵Xin Li
am: c8f602d4d0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14974087 Change-Id: I42140b7f4355e2d29f751ed0a454fe54254635b7
2021-06-18[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s oursXin Li
am skip reason: Merged-In I2087170aceb7c0670afd04fcc779047aa95a373f with SHA-1 0e459673aa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14974087 Change-Id: Ife2f6fb0e39e46724a09a8e059f5442eed22c90a
2021-06-17DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Merged-In: I2087170aceb7c0670afd04fcc779047aa95a373f Change-Id: Ic06907b897166d632b67dac8151b3cd62e5e4c20
2021-06-07[automerger skipped] Switch media fw permissions checks to AttributionSource ↵Svet Ganov
(voip) am: 599af3cf25 am: 15bb2977b8 -s ours am skip reason: Merged-In Iec62f7afa8ca128886a85f425f7a92122ed2155c with SHA-1 599af3cf25 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721 Change-Id: Ic956ffd32fc3ee0f0372271f913937b567b7cb48
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 02:06:12 +0000