summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-04-15Merge "Replace `ro.kernel.` with `ro.boot.`" am: 415413a355 am: 619e7f9672 ↵Treehugger Robot
am: 50e386b635 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1676389 Change-Id: If7984faac253709c522e847a616acb9ef252e1fd
2021-04-15Merge "Replace `ro.kernel.` with `ro.boot.`" am: 415413a355 am: 619e7f9672Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1676389 Change-Id: I1fa1a2c2013ece9bb8971629cd8e603c615be0bc
2021-04-15Merge "Replace `ro.kernel.` with `ro.boot.`" am: 415413a355android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1676389 Change-Id: Iba8d52a1d985d6bcb9c8e1b393a77749f30468c0
2021-04-15Merge "Replace `ro.kernel.` with `ro.boot.`"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-14Replace `ro.kernel.` with `ro.boot.`Roman Kiryanov
`ro.kernel` is deprecated. Bug: 182291166 Test: presubmit Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: If1994ea46f59f608450591f0cd417e7bb8b43fdc
2021-04-13Merge "Remove local dynamic array" am: 33dda50e8a am: ff7fde0faf am: 7ecc69ca36Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1666339 Change-Id: I5e54e21bcd411b93f9190bd74a017ff72f114eea
2021-04-13Merge "Remove local dynamic array" am: 33dda50e8a am: ff7fde0fafTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1666339 Change-Id: I26829677d160cfccee2b30d58ccce6e36e6d1743
2021-04-13Merge "Remove local dynamic array" am: 33dda50e8aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1666339 Change-Id: Ic7d1dbbae3855ea762eefcf2047036c0b99ac7f5
2021-04-13Merge "Remove local dynamic array"Treehugger Robot
2021-04-07Remove local dynamic arraySukanya Rajkhowa
Convert dynamic array in stack into vector and heap buffers. Bug: 184024154 Change-Id: I3c9e3f9d7ebb74837d00e8842f3d456512c513a2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3b85c7fef5 -s ↵Xin Li
ours am: 7376cf648c -s ours am skip reason: Change-Id I4fef14ff40117a98869e946351cc0ae672a99853 with SHA-1 14f36fec42 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If47f1911201eefe533b0f148d6b965c15e1a3631
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/ril" am: a586a9c2d5 am: ↵Bob Badour
f5ed50edda am: 7fb343d5bb Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1588039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52e23ec8943c69a13e6055cbc09726d07e47b960
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3b85c7fef5 -s oursXin Li
am skip reason: Change-Id I4fef14ff40117a98869e946351cc0ae672a99853 with SHA-1 14f36fec42 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9e295e81a74325ae3d5a994a04187e62548bc52e
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I4fef14ff40117a98869e946351cc0ae672a99853 Change-Id: I5e346c941286b91b6731a9d1b9a680b1818daa54
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/ril" am: a586a9c2d5 am: ↵Bob Badour
f5ed50edda Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1588039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d56dd50c58876b1315f01d77610ebef53ec13b4
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/ril" am: a586a9c2d5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1588039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6465f4d0a1e3563c718df98c82f23849f03dff80
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/ril"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/rilBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp libril/Android.mk librilutils/Android.bp reference-ril/Android.mk rild/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iff72ffd6e3da98a6400bc941b39a239cc7b33c79
2021-01-20Merge "Retire libqemu_pipe from libreference-ril" am: 3438d03c30 am: ↵Roman Kiryanov
debcd7526f am: 3936861a84 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1554914 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ea47c7628241fae5b93769914f8eff5fe4d869d
2021-01-20Merge "Retire libqemu_pipe from libreference-ril" am: 3438d03c30 am: debcd7526fRoman Kiryanov
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1554914 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic4e11dd39fbd97d6023071c73f87a8fc33b91554
2021-01-20Merge "Retire libqemu_pipe from libreference-ril" am: 3438d03c30Roman Kiryanov
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1554914 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5a3c722ac7f43418297f203a71ecd504974abbdf
2021-01-20Merge "Retire libqemu_pipe from libreference-ril"android-s-preview-1Roman Kiryanov
2021-01-19Retire libqemu_pipe from libreference-rilRoman Kiryanov
libqemu_pipe will be retired since goldfish is migrating to virtio-vsock. Bug: 169261468 Test: presubmit Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: I4147866d7a7cdc5bddfc47266b05ba68af303a9d
2020-11-23Mark ab/6881855 as merged am: 503a11b0d8 am: 14f36fec42Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/13111234 Change-Id: Ibf314553e174e5ca27bf0fb881343178d5e7d95f
2020-11-23Mark ab/6881855 as merged am: 503a11b0d8Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/13111234 Change-Id: I4fef14ff40117a98869e946351cc0ae672a99853
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I77c82d712e8a08d499609e1537e0920432ec1df6
2020-10-27Merge "Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctly" am: ↵Treehugger Robot
4729b84992 am: 33f79bed54 am: be43386d15 am: 4c09d5b971 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1471647 Change-Id: I79aaf694eff56ca6b83d4fc179f95539ce8d93f3
2020-10-27Merge "Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctly" am: ↵Treehugger Robot
4729b84992 am: 33f79bed54 am: be43386d15 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1471647 Change-Id: I2386fb4f58be5a93a666efdb37d31177d6247105
2020-10-27Merge "Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctly" am: ↵Treehugger Robot
4729b84992 am: 33f79bed54 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1471647 Change-Id: I3b5581de52bfdac1d2b8d81a7b7665fdf5185b38
2020-10-27Merge "Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctly" am: ↵Treehugger Robot
4729b84992 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1471647 Change-Id: I00e8a517b9cbb76fe78495bdad47941136958554
2020-10-27Merge "Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctly"Treehugger Robot
2020-10-23Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctlyTaesu Lee
Bug: 171531258 Test: Manual Signed-off-by: Taesu Lee <taesu82.lee@samsung.com> Change-Id: I1a9f45da109410a96a1e189ef4a8cced8919d057
2020-10-12[automerger skipped] Skip ab/6749736 in stage. am: 93b625c199 -s ours am: ↵Xin Li
823eab4c05 -s ours am: 1b9a4091c5 -s ours am skip reason: Change-Id I271e6fb0abeae2cd4e3f9083dd48607d60a8c4ad with SHA-1 e9d0552de8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/12797313 Change-Id: If67b62777698a4679c9821b02b5cbea3ec5882fe
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 93b625c199 -s ours am: ↵Xin Li
823eab4c05 -s ours am skip reason: Change-Id I271e6fb0abeae2cd4e3f9083dd48607d60a8c4ad with SHA-1 e9d0552de8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/12797313 Change-Id: I9929c977f6671e45d4bb362d908f68413180b62f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 93b625c199 -s oursXin Li
am skip reason: Change-Id I271e6fb0abeae2cd4e3f9083dd48607d60a8c4ad with SHA-1 e9d0552de8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/12797313 Change-Id: I7c6b0438c3d972ccc0560acab80231ee5be45ccd
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I271e6fb0abeae2cd4e3f9083dd48607d60a8c4ad Change-Id: I8cc20570c3d0c7961307aecee54d25ae1fa753b2
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 850741d2cb -s ours am: b675417913 -s ours am: 098fd136f5 -s ours am: 63aafded11 -s ours am skip reason: Change-Id I890e1b9395ebe8f17d5739fb3169f9a9b80282b0 with SHA-1 948e8c1a66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/12469984 Change-Id: Ib5a09518c5583179bda43267006ddaeaa6ce87f6
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 850741d2cb -s ours am: b675417913 -s ours am: 098fd136f5 -s ours am skip reason: Change-Id I890e1b9395ebe8f17d5739fb3169f9a9b80282b0 with SHA-1 948e8c1a66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/12469984 Change-Id: I8705cc2caa1687995d11f7838d090c850733af22
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 850741d2cb -s ours am: b675417913 -s ours am skip reason: Change-Id I890e1b9395ebe8f17d5739fb3169f9a9b80282b0 with SHA-1 948e8c1a66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/12469984 Change-Id: I755b983016c6c47dde4e0a3ca93ef1eacbf99fc8
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 850741d2cb -s ours am skip reason: Change-Id I890e1b9395ebe8f17d5739fb3169f9a9b80282b0 with SHA-1 948e8c1a66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/12469984 Change-Id: I2dbb6e05979287fac1fb467d1d31db31723bf14d
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I890e1b9395ebe8f17d5739fb3169f9a9b80282b0 Change-Id: I079786b9cfd72218c0a394bf1bd68a07191b7a98
2020-08-21Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04 ↵Treehugger Robot
am: 2cc8c73b82 am: c0b71d31b0 am: e92568023f am: 986ec65138 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1407077 Change-Id: I66291cf285a2831a9a1126ac2b449e0ec6e1c76e
2020-08-21Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04 ↵Treehugger Robot
am: 2cc8c73b82 am: c0b71d31b0 am: e92568023f Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1407077 Change-Id: I1abb13118f195d7504ad56a7b1134396cab8766b
2020-08-21Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04 ↵Treehugger Robot
am: 2cc8c73b82 am: c0b71d31b0 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1407077 Change-Id: Iecca843ff56e3de5f189cf0c86613daf18c96090
2020-08-21Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04 ↵Treehugger Robot
am: 2cc8c73b82 Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1407077 Change-Id: I624d53e611729972b471304247e1b11638d46e0f
2020-08-21Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1407077 Change-Id: I1c71a682b63a26ea20c4a4f5930933f99e4712cf
2020-08-21Merge "Fix -Wformat error with explicit void* -> char* cast."Treehugger Robot
2020-08-21Fix -Wformat error with explicit void* -> char* cast.Stephen Hines
hardware/ril/reference-ril/reference-ril.c:1841:46: error: format specifies type 'char *' but the argument has type 'void *' [-Werror,-Wformat] snprintf(cmd, sizeof(cmd), "AT+CCHO=%s", data); ~~ ^~~~ Bug: http://b/155835175 Test: m Change-Id: I7fd819c6c452b56aae15429344320c4cdaed702c (cherry picked from commit 363b39bbc81a3269fe75bd5f505289f85d05792e)
2020-08-17Fix -Wformat error with explicit void* -> char* cast.Stephen Hines
hardware/ril/reference-ril/reference-ril.c:1841:46: error: format specifies type 'char *' but the argument has type 'void *' [-Werror,-Wformat] snprintf(cmd, sizeof(cmd), "AT+CCHO=%s", data); ~~ ^~~~ Bug: http://b/155835175 Test: m Change-Id: I7fd819c6c452b56aae15429344320c4cdaed702c