summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b008c1149d -s ours ↵android-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_r56android-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_r32android13-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-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseXin Li
am: 5e6f71008d -s ours am: 1fa67fb80d -s ours am: 430b1acdd3 -s ours am skip reason: Merged-In I9a69d12332bf65b73750afa58465d68f2161163e with SHA-1 20a8c2dcee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/17544694 Change-Id: Iffb35396844194a9a39473a9fa475cccf1dc2778 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b008c1149d -s ours ↵Xin Li
am: 5e6f71008d -s ours am: 1fa67fb80d -s ours am skip reason: Merged-In I9a69d12332bf65b73750afa58465d68f2161163e with SHA-1 20a8c2dcee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/17544694 Change-Id: Icb593e15741e638eeeefaf348ae94edc3e336436 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b008c1149d -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devXin Li
am: 5e6f71008d -s ours am skip reason: Merged-In I9a69d12332bf65b73750afa58465d68f2161163e with SHA-1 20a8c2dcee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/17544694 Change-Id: Ic7497312c5d46374149a9921279494d7407cf5ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b008c1149d -s oursXin Li
am skip reason: Merged-In I9a69d12332bf65b73750afa58465d68f2161163e with SHA-1 20a8c2dcee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/17544694 Change-Id: I7d2fb12b5f21587080e1e40894012bbbd242535d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: I9a69d12332bf65b73750afa58465d68f2161163e Change-Id: I379a359858aaae8726ba6ff41a96a1b53e071123
2022-03-30Merge "Clear apex.go entries for bluetooth libs" am: 5e8381327b am: ↵Treehugger Robot
f21d38068d am: 20a8c2dcee Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/2042086 Change-Id: I2a40315c43bd4456b5f4384460261ceb18d0ec68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge "Clear apex.go entries for bluetooth libs" am: 5e8381327b am: f21d38068dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/2042086 Change-Id: I9a69d12332bf65b73750afa58465d68f2161163e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge "Clear apex.go entries for bluetooth libs" am: 5e8381327bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/2042086 Change-Id: I4289c19f705bf87a7297f46f31ad05f7f79fab19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Merge "Clear apex.go entries for bluetooth libs"Treehugger Robot
2022-03-24Clear apex.go entries for bluetooth libsWilliam Escande
The module availability to Bluetooth is currently hard-coded in apex.go. We are in the process of cleaning the apex.go by adding the availability in each required module Test: Build + TH + boot phone & use bluetooth Bug: 216433795 Change-Id: I5cef83d960ae56104a41356c00867cebd54f0c5d
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: e5d4712ba2 -s ours am: 3d7419b262 -s ours am skip reason: Merged-In Ie1caad9ffcd8ac9e2544b627ad85966178dc00a1 with SHA-1 6f309fc246 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/16842400 Change-Id: I4ecbc84dc2e86afaa8fdf13fa401e3031796ebea
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: e5d4712ba2 -s ours am skip reason: Merged-In Ie1caad9ffcd8ac9e2544b627ad85966178dc00a1 with SHA-1 6f309fc246 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/16842400 Change-Id: Ic6a211e0c5b471e146a87aaf9885e4af992abae3
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: Ie1caad9ffcd8ac9e2544b627ad85966178dc00a1 Change-Id: I4b9ae01654025c928a92fc47cde05e11b4d16aa0
2022-02-03Merge "Adding bluetooth apex" am: 873879d5f3 am: 2e65481365 am: 18573ab7aa ↵Roopa Sattiraju
am: e298c7414b Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1931123 Change-Id: Iaff056328272f86218d510ec822902e097e50f6d
2022-02-03Merge "Adding bluetooth apex" am: 873879d5f3 am: 2e65481365 am: 18573ab7aaRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1931123 Change-Id: Ic6e9ae86d8a49eb0786890483d2ab24c6f8597bd
2022-02-03Merge "Adding bluetooth apex" am: 873879d5f3 am: 2e65481365Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1931123 Change-Id: Ie2128ca9add6201218bd40e8871ba3a1ac19c6c4
2022-02-03Merge "Adding bluetooth apex" am: 873879d5f3Roopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1931123 Change-Id: Ibdcfca4cac5b7768cb6766f381a52e0ac169a8bf
2022-02-03Merge "Adding bluetooth apex"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-1Roopa Sattiraju
2021-12-23Adding bluetooth apexRoopa Sattiraju
Bug: 206121418 Test: Compile Change-Id: Ia4a6ad056fe2f9dcc649de8bde2346ad41424192
2021-12-09Merge "Fix mismatched allocation/deallocation" am: 5c1f34d918 am: 78865000d5 ↵Treehugger Robot
am: 88a4f2c36c am: 583d4a6a4d Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1914829 Change-Id: If41331ae05320776ae7e1486395080352a6f523f
2021-12-09Merge "Fix mismatched allocation/deallocation" am: 5c1f34d918 am: 78865000d5 ↵Treehugger Robot
am: 88a4f2c36c Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1914829 Change-Id: I2a30ffa4f776d00a3e012aa5ee913975f2f8b2df
2021-12-09Merge "Fix mismatched allocation/deallocation" am: 5c1f34d918 am: 78865000d5Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1914829 Change-Id: I22f896a90c488e42e06ec7e824f9bc2570cc0a5b
2021-12-09Merge "Fix mismatched allocation/deallocation" am: 5c1f34d918Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1914829 Change-Id: Ibcf7ac0204d7fcf82bc4ed9e011b9204291b8094
2021-12-09Merge "Fix mismatched allocation/deallocation"Treehugger Robot
2021-12-08Fix mismatched allocation/deallocationGreg Kaiser
When we use "new[]", we need to use "delete[]", not "delete". Test: TreeHugger Change-Id: Ie1caad9ffcd8ac9e2544b627ad85966178dc00a1
2021-10-08[automerger skipped] Merge "Merge Android 12" am: c9f4ae08f1 -s ours am: ↵Xin Li
2fbfd23067 -s ours am: f0d922687a -s ours am: 26e09c32d7 -s ours am: 2604ce2835 -s ours am skip reason: Merged-In I6f522d6d244351a294cfa10defa2744cf5f16564 with SHA-1 937ffae447 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1847664 Change-Id: I5ec3c27f5126e035a7b1fc91a6666280dc4a46bb
2021-10-08[automerger skipped] Merge "Merge Android 12" am: c9f4ae08f1 -s ours am: ↵Xin Li
2fbfd23067 -s ours am: f0d922687a -s ours am: 26e09c32d7 -s ours am skip reason: Merged-In I6f522d6d244351a294cfa10defa2744cf5f16564 with SHA-1 937ffae447 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1847664 Change-Id: Icea498c580f3ec8b5a3b372a140d722ac9f18b16
2021-10-08[automerger skipped] Merge "Merge Android 12" am: c9f4ae08f1 -s ours am: ↵Xin Li
2fbfd23067 -s ours am: f0d922687a -s ours am skip reason: Merged-In I6f522d6d244351a294cfa10defa2744cf5f16564 with SHA-1 937ffae447 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1847664 Change-Id: I2c6a0a6910098a3e838c7b31ab6b3b6dd8c8c59c
2021-10-08[automerger skipped] Merge "Merge Android 12" am: c9f4ae08f1 -s ours am: ↵Xin Li
2fbfd23067 -s ours am skip reason: Merged-In I6f522d6d244351a294cfa10defa2744cf5f16564 with SHA-1 937ffae447 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1847664 Change-Id: Ibb3311763aa4a556269edbf3f4b7411ef9d7fb4b
2021-10-08[automerger skipped] Merge "Merge Android 12" am: c9f4ae08f1 -s oursXin Li
am skip reason: Merged-In I6f522d6d244351a294cfa10defa2744cf5f16564 with SHA-1 937ffae447 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1847664 Change-Id: I586cb0dd120acec2a314eafb7e0caaab4613be8d
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: I6f522d6d244351a294cfa10defa2744cf5f16564 Change-Id: I4b7101bc5f107cb39a290672951b7c36cbc41840
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
937ffae447 -s ours am: 77ef4ed3cf -s ours am: 066e345697 -s ours am: 7dfb3ef204 -s ours am skip reason: Merged-In I914766c7f155468a250afe5b8f42a16c57b1ea35 with SHA-1 3c15b686ed is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/15571710 Change-Id: Ic5ba3c7b4ba91005de2fbe5d0f4c5f1de36f3b7e
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
937ffae447 -s ours am: 77ef4ed3cf -s ours am: 066e345697 -s ours am skip reason: Merged-In I914766c7f155468a250afe5b8f42a16c57b1ea35 with SHA-1 3c15b686ed is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/15571710 Change-Id: I38c2c0cc780971430fa5b0569eb933df360811a7
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
937ffae447 -s ours am: 77ef4ed3cf -s ours am skip reason: Merged-In I914766c7f155468a250afe5b8f42a16c57b1ea35 with SHA-1 3c15b686ed is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/15571710 Change-Id: Ife7242e6f35a3c51dbe40694e567ce096dfae8ee
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
937ffae447 -s ours am skip reason: Merged-In I914766c7f155468a250afe5b8f42a16c57b1ea35 with SHA-1 3c15b686ed is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/15571710 Change-Id: Ib39a3590310f29120b5b3973824e368d536f90e2
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I914766c7f155468a250afe5b8f42a16c57b1ea35 Change-Id: I6f522d6d244351a294cfa10defa2744cf5f16564
2021-06-03[Telephony] Remove IOem in ril am: 899ef068c6 am: 4c30b70132Zoey Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/14759714 Change-Id: Ib2805dec9880e2adcbcb1c89d52d8997fb910ae4
2021-06-03[Telephony] Remove IOem in ril am: 899ef068c6 am: 3c15b686ed am: 55c31caa93Zoey Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/14759714 Change-Id: I52ee1e25fbc59b633144d22b63e1cab5d4d6b620
2021-06-03[Telephony] Remove IOem in ril am: 899ef068c6 am: f315484700 am: 6658592db8Zoey Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/14759714 Change-Id: Ie008b9c143d2a6fb9295f64a8dfb1aa578bed27a
2021-06-03[Telephony] Remove IOem in ril am: 899ef068c6 am: 3c15b686edZoey Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/14759714 Change-Id: If9c25245e0841ea9098d2b7f6ebe96801b8908da
2021-06-03[Telephony] Remove IOem in ril am: 899ef068c6 am: f315484700Zoey Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/14759714 Change-Id: I80a39170ef514daec90908c5656f247f1e4db7c1
2021-06-03[Telephony] Remove IOem in ril am: 899ef068c6android-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_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseZoey Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/14759714 Change-Id: Id0207ffd303da65d33f80ba34dbb503da31e0dc8
2021-06-03[Telephony] Remove IOem in ril am: 899ef068c6android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseZoey Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/14759714 Change-Id: Id53100f31d77a88e247af9525dc395db094e375b
2021-06-03[Telephony] Remove IOem in ril am: 899ef068c6Zoey Chen
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/14759714 Change-Id: I914766c7f155468a250afe5b8f42a16c57b1ea35
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ia0f23f7b7cf2a94914a6881e63a9f380fb16efe4
2021-06-02[Telephony] Remove IOem in rilandroid-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devZoey Chen
Bug: 171260715 Test: make, atest com.android.internal.telephony.RILTest Change-Id: I9089ac911bbd5063b560d37dbc100fb9d60f21e0
2021-05-15Merge "Replace `ro.kernel.` with `ro.boot.`" am: 415413a355 am: 619e7f9672 ↵Treehugger Robot
am: 50e386b635 am: f0ff2e1583 am: 54a65dbff9 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1676389 Change-Id: I5a9ceb548a3c4dde862024f86ef666d889fda79e
2021-04-15Merge "Replace `ro.kernel.` with `ro.boot.`" am: 415413a355 am: 619e7f9672 ↵Treehugger Robot
am: 50e386b635 am: f0ff2e1583 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1676389 Change-Id: Ibaed426ffad353aa0a4206dbd5aa42b8078f54d8
2021-04-15Merge "Replace `ro.kernel.` with `ro.boot.`" am: 415413a355 am: 619e7f9672 ↵Treehugger Robot
am: 50e386b635 am: f0ff2e1583 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1676389 Change-Id: I6af6a203a40349ae0341c56216c3758b5707b1b2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 09:01:09 +0000