summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 5663715 from cffbeaf2db40ac50eccbdd863632f67cc8ed2b06 to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot2019-06-151-0/+1
|\ | | | | | | | | | | qt-c2f2-release Change-Id: If2e891a8ba3c59f9d6e198c9d2054d08f9e58ddd
| * Add RIL_UNSOL_KEEPALIVE_STATUS in ril_unsol_commands.handroid-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_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_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseGary Jian2019-06-131-0/+1
|/| | | | | | | | | | | am: 2093efa562 Change-Id: I8432b299e0b85b6471083c295f1581ff5d4f2847
| * Add RIL_UNSOL_KEEPALIVE_STATUS in ril_unsol_commands.handroid10-devGary Jian2019-06-061-0/+1
|/ | | | | | | | | | Bug: 134048171 Test: 1. Build Pass 2. Running atest android.net.cts.ConnectivityManagerTest #testSocketKeepaliveLimitTelephony and make sure the Telephony FWK can receive RIL_UNSOL_KEEPALIVE_STATUS. Change-Id: I98f8d4a95a6c9c3c078a02aa9fd8722779623f12
* Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
|\ | | | | | | | | | | am: 63879f189c Change-Id: I3f2335624a28ac0a0980380995cb686801aee80f
| * Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-03-291-2/+1
| |\ | |/ |/| | | | | Change-Id: Iafbdddb6c6ebb647746c7a3e743e925f278f6fda BUG: 129345239
* | Merge "Do not call rilc_thread_pool if there is no ril library" am: ↵Roman Kiryanov2019-03-201-2/+1
|\ \ | |/ |/| | | | | | | | | | | 001a126f8b am: 61eae8ffd1 am: 976eb99d92 Change-Id: Id43e20b668a7b9b0df93bed3f2edfe956a7c664c
| * Merge "Do not call rilc_thread_pool if there is no ril library" am: 001a126f8bRoman Kiryanov2019-03-201-2/+1
| |\ | | | | | | | | | | | | | | | am: 61eae8ffd1 Change-Id: Ia5ae77b5c7655503031bd44c557a9ac074b7e7e0
| | * Merge "Do not call rilc_thread_pool if there is no ril library"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Roman Kiryanov2019-03-201-2/+1
| | |\ | | | | | | | | | | | | | | | | | | | | am: 001a126f8b Change-Id: Ib83df4199f842800c14a68aa21341b298121a91b
| | | * Merge "Do not call rilc_thread_pool if there is no ril library"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot2019-03-211-2/+1
| | | |\
| | | | * Do not call rilc_thread_pool if there is no ril libraryRoman Kiryanov2019-03-201-2/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rilc_thread_pool crashes if RIL_register is never called because RIL_register sets the threadpool which rilc_thread_pool joins to. Test: make Bug: 117327079 Change-Id: If249561375748d42f1b8593ac9794fdfa1b76d18 Signed-off-by: Roman Kiryanov <rkir@google.com>
* | | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into ↵Xin Li2019-03-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: 8a206a0e27 -s ours am: 4df6a14940 -s ours am: 23d2f26d06 -s ours am skip reason: subject contains skip directive Change-Id: I1f4c8028bf38d49545ae4dfdb578cf1b55924ff0
| * | | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into ↵Xin Li2019-03-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master" am: 8a206a0e27 -s ours am: 4df6a14940 -s ours am skip reason: subject contains skip directive Change-Id: I14c8d4729a1cb371b9248a373014f280fa018d98
| | * | [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Xin Li2019-03-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | am: 8a206a0e27 -s ours am skip reason: subject contains skip directive Change-Id: Ic738bb413ceb3a409446692d176cb29755c7e41d
| | | * Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"android-q-preview-1android-o-mr1-iot-release-1.0.10Treehugger Robot2019-03-110-0/+0
| | | |\
* | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li2019-03-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 653c30840f -s ours am: 79ef3c3f65 -s ours am: 8e242a5262 -s ours am skip reason: subject contains skip directive Change-Id: I2cc57cb4759ca91d40c132feba46692e45162c8d
| * | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li2019-03-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 653c30840f -s ours am: 79ef3c3f65 -s ours am skip reason: subject contains skip directive Change-Id: Iad2d831fe90c2cf1587ba40e3dd09ef634c370f7
| | * | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | am: 653c30840f -s ours am skip reason: subject contains skip directive Change-Id: I36d97e1ec9b9fb894c0c239c415a2dc8c9c52593
| | | * | DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | Bug: 127812889 Change-Id: Id628051e8dde2bce29ae874b190b5e25758efe46
* | | | | Merge "Use 32BIT nanopb library."TreeHugger Robot2019-03-062-2/+4
|\ \ \ \ \
| * | | | | Use 32BIT nanopb library.Yu Shan2019-02-192-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: None Bug: 122292884 Change-Id: Idb0d56749e41aa97a760dfed5246330041c3da3a
* | | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | am: 4a431edc85 Change-Id: I5cd71e856c80c861d464c199dc41332ac6651f33
| * | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Bug: 126125118 Change-Id: If68db2b53dffe4c33f9fb34019020d6253ac0679
| | * | | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I4f5019a9b58e64ccc733556646673966260d9524
* | | | | | | Handle MCC/MNC in data registration state provided by legacy vendor RILsGohulan Balachandran2019-02-141-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include MCC/MNC provided by legacy (versions 14 and older) vendor RIL implementations as part of data registration state, in data registration state reported to clients of the radio HAL service. Bug: 119904357 Test: local build and did the local test on Marlin device, the mcc/mnc value are correct (not -1 and empty string value). Change-Id: I5a26939402b86d889133e16f3508ab76b8bedddc
* | | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-110-0/+0
|\| | | | | | | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: 59449b4c75 -s ours am: 40fd020dc4 -s ours am skip reason: subject contains skip directive Change-Id: I1b788e8df7dad8c6b326bdc2f48f1eaba4a30f95
| * | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-02-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190205.001) into stage-aosp-master am: 59449b4c75 -s ours am skip reason: subject contains skip directive Change-Id: I93f1084ccdac4ee7f45684cbac1d399c791bc37b
| | * | | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li2019-02-110-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 124234733 Change-Id: I0d1f506ed30baff926c0dd0c3a7e1e30b7b710af
| | | * | | Snap for 5180536 from 082e32effc07dddd06b67d2be2c2c6ee554d5d52 to ↵pie-platform-releaseandroid-build-team Robot2019-02-093-15/+181
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: Ibd53a72bf47948b3fc264a30fd84b19cca83577d
| | | | * \ \ Merge "Snap for 5053079 from 5f438e18ba37089a8ae58fca529ab1cb964e9f81 to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot2018-10-060-0/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release" into pi-qpr2-release
| | | | | * \ \ Snap for 5053079 from 5f438e18ba37089a8ae58fca529ab1cb964e9f81 to ↵android-build-team Robot2018-10-063-15/+181
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: Ie86cd6aae2b1ad9fa68af015827da13623bd1e52
| | | | * | \ \ \ Snap for 5053079 from 5f438e18ba37089a8ae58fca529ab1cb964e9f81 to ↵android-build-team Robot2018-10-063-15/+181
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | | |/ / / | | | | | | | | | | | | | | | | pi-qpr2-release Change-Id: I7ed0422e4a142d9e4ce13cd87df7cee85b24de10
* | | | | | | | Merge "Fix protocol buffer compiler warning"TreeHugger Robot2019-01-241-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix protocol buffer compiler warningjimsun2019-01-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning message: [ 86% 23128/26768] //hardware/ril/librilutils:librilutils protoc proto/sap-api.proto [libprotobuf WARNING external/protobuf/src/google/protobuf/compiler/parser.cc:547] No syntax specified for the proto file: hardware/ril/librilutils/proto/sap-api.proto. Please use 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. (Defaulted to proto2 syntax.) Bug: 123039027 Test: build pass withtout warning message printed out Change-Id: Ie340518a2f4758817bc3402fc897f918a8e89df6
* | | | | | | | | Merge "ril: set initial value to GW timingAdvance" am: 1106273899 am: 76482b9fc6Tim Lin2019-01-221-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | am: a6ecf622db Change-Id: I0c147e42cb0b0f9048b71f3967da7d5dbd73d502
| * | | | | / / Merge "ril: set initial value to GW timingAdvance" am: 1106273899Tim Lin2019-01-221-0/+4
| |\| | | | | | | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: 76482b9fc6 Change-Id: I8403bbf345ed531c559d89c4a666445a10922be0
| | * | | | | Merge "ril: set initial value to GW timingAdvance"Tim Lin2019-01-221-0/+4
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: 1106273899 Change-Id: I4cf3a32da7c63dc89dc996fcb534d8772eb77c63
| | | * | | | Merge "ril: set initial value to GW timingAdvance"Treehugger Robot2019-01-231-0/+4
| | | |\ \ \ \
| | | | * | | | ril: set initial value to GW timingAdvanceTim Lin2019-01-221-0/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RIL_SignalStrength_v10 not support gw.timingAdvance. But default 0 will be taken as valid value. Set to INT_MAX as invalid value. Bug: 123096279 Test: Build pass. Correct value for GW timingAdvance in radio log. 01-22 16:22:41.150 1779 1910 V RILJ : [UNSL]< UNSOL_SIGNAL_STRENGTH SignalStrength:{ mGsm=CellSignalStrengthGsm: rssi=2147483647 ber=99 mTa=2147483647 Change-Id: I37cc2c246d045a07ffad863fb0cc852d8184c3ca
* | | | | | | Merge "The index value shall be -1 if there is no relevant application" am: ↵Ryuto Sawada2018-12-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 902fa44011 am: 4df763b290 am: f20719661f Change-Id: I43b9124e27e4cb49462026d325562f5550e9fb48
| * | | | | | Merge "The index value shall be -1 if there is no relevant application" am: ↵Ryuto Sawada2018-12-041-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 902fa44011 am: 4df763b290 Change-Id: I11f48f72a98d0fcc5e75b979b512844c23bd1797
| | * | | | | Merge "The index value shall be -1 if there is no relevant application"Ryuto Sawada2018-12-041-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 902fa44011 Change-Id: I57f77a8f19dd646eb6c5698e0b680573070b19c9
| | | * | | | Merge "The index value shall be -1 if there is no relevant application"android-wear-8.0.0_r2android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot2018-12-041-1/+1
| | | |\ \ \ \
| | | | * | | | The index value shall be -1 if there is no relevant applicationRyuto Sawada2017-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The index value for GSM/CDMA/IMS application shall be -1 if there is no relevant application according to the comment written for CardStatus structure in radio/types.hal, so it shall be initialized to -1. Bug: 63967442 Test: Confirm that the index values are correctly initialized. Change-Id: I692e9049145d0f0c3c57879c25d0697879c76b39
* | | | | | | | Merge "Convert librilutils to Android.bp" am: 1dc06a8cfa am: 3630e372e2Dan Willemsen2018-11-204-62/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6320625d65 Change-Id: If5104624900b742b842b391986b6c3e8b027cb2f
| * | | | | | | Merge "Convert librilutils to Android.bp" am: 1dc06a8cfaDan Willemsen2018-11-204-62/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3630e372e2 Change-Id: Icaa4f51a877af4926abf90a5179f60ac48008314
| | * | | | | | Merge "Convert librilutils to Android.bp"Dan Willemsen2018-11-204-62/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1dc06a8cfa Change-Id: Ic5cff233f6175530f6d8d6d794b71271f7534c6d
| | | * | | | | Merge "Convert librilutils to Android.bp"android-n-iot-release-ihome-igv1nougat-iot-releaseTreehugger Robot2018-11-204-62/+42
| | | |\ \ \ \ \
| | | | * | | | | Convert librilutils to Android.bpDan Willemsen2018-11-164-62/+42
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Test: cd hardware/ril; mma Change-Id: I39b5a8df5ca44c951640d3c32e7fa77530898014
* | | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 8e228fc8be -s ours am: 40e71f7952 -s ours am: 021ef37bc2 -s ours Change-Id: If7311984b5ac848a37d25c7c010f85bff13ed774
| * | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 8e228fc8be -s ours am: 40e71f7952 -s ours Change-Id: I5b3358deffad9a0eb7ac34b1ca80a01c2c7279ab