OSDN Git Service
nharold [Mon, 10 Jul 2017 17:18:06 +0000 (17:18 +0000)]
Merge "Fix the RIL-to-HIDL conversion for Cell Lat and Long" am:
988cd1f5d3 am:
799ca6b5d3 am:
69bf530bd1
am:
8988adf9ba
Change-Id: I333abea0aeb0dd290908f72d1f71e79eb4725331
nharold [Mon, 10 Jul 2017 17:05:42 +0000 (17:05 +0000)]
Merge "Fix the RIL-to-HIDL conversion for Cell Lat and Long" am:
988cd1f5d3 am:
799ca6b5d3
am:
69bf530bd1
Change-Id: Icff684b4d429a6c18c79c3a076324369e73f179f
nharold [Mon, 10 Jul 2017 17:01:08 +0000 (17:01 +0000)]
Merge "Fix the RIL-to-HIDL conversion for Cell Lat and Long" am:
988cd1f5d3
am:
799ca6b5d3
Change-Id: Ie866dd4745cc8d60e7c7075793ffad04e0588535
nharold [Mon, 10 Jul 2017 16:57:04 +0000 (16:57 +0000)]
Merge "Fix the RIL-to-HIDL conversion for Cell Lat and Long"
am:
988cd1f5d3
Change-Id: I1bdf739541040288ece81d20de889f172e3ae28d
nharold [Mon, 10 Jul 2017 16:51:01 +0000 (16:51 +0000)]
Merge "Fix the RIL-to-HIDL conversion for Cell Lat and Long"
Nathan Harold [Sat, 8 Jul 2017 00:12:04 +0000 (17:12 -0700)]
Fix the RIL-to-HIDL conversion for Cell Lat and Long
The legacy RIL interface received Lat and Long in that order.
The HIDL interface structure uses Long and Lat. This fixes
a swaparoo in the compatibility layer.
* RIL_REQUEST_VOICE_REGISTRATION_STATE
*
* ... skipping a bunch of stuff
*
* ((const char **)response)[5] is Base Station latitude if registered on a
* CDMA system or NULL if not. Base Station
* latitude is a decimal number as specified in
* 3GPP2 C.S0005-A v6.0. It is represented in
* units of 0.25 seconds and ranges from -
1296000
* to
1296000, both values inclusive (corresponding
* to a range of -90 to +90 degrees).
* ((const char **)response)[6] is Base Station longitude if registered on a
* CDMA system or NULL if not. Base Station
* longitude is a decimal number as specified in
* 3GPP2 C.S0005-A v6.0. It is represented in
* units of 0.25 seconds and ranges from -
2592000
* to
2592000, both values inclusive (corresponding
* to a range of -180 to +180 degrees).
Bug:
63274800
Test: manual
Change-Id: If2de7f5d0e0d0f470f824aa4f2329de4ad98eb6c
bohu [Mon, 3 Jul 2017 04:33:28 +0000 (21:33 -0700)]
rild: fix missing simcard in emulator
This CL adds one additional application: ims, in addition to
existing gsm and cdma applications.
Test: build sdk_phone_x86-eng, launch emulator
and the radio should work.
Change-Id: Icc2a2ba77741b4ec504d521f994af666aa168bdc
Nathan Harold [Thu, 29 Jun 2017 02:11:16 +0000 (02:11 +0000)]
Merge "Add cross-validation to IccCardStatusResponse" into oc-dr1-dev am:
b4d732b046
am:
3419deee60
Change-Id: Ic5057969ab6b809320c2909a39a000354cea3ec9
Nathan Harold [Thu, 29 Jun 2017 02:07:19 +0000 (02:07 +0000)]
Merge "Add cross-validation to IccCardStatusResponse" into oc-dr1-dev
am:
b4d732b046
Change-Id: I1751ae160e10ebf38619fa07257e038d41174172
TreeHugger Robot [Thu, 29 Jun 2017 02:03:18 +0000 (02:03 +0000)]
Merge "Add cross-validation to IccCardStatusResponse" into oc-dr1-dev
Sanket Padawe [Wed, 28 Jun 2017 17:54:11 +0000 (17:54 +0000)]
Merge "Fix memory alignment for dispatchImsCdmSms while sending data to vendor code." into oc-dr1-dev am:
ee7a68c226
am:
580b3bcd85
Change-Id: I36d5cec933bd7c366241a5b5d06470ff772f2255
Sanket Padawe [Wed, 28 Jun 2017 17:51:11 +0000 (17:51 +0000)]
Merge "Fix memory alignment for dispatchImsCdmSms while sending data to vendor code." into oc-dr1-dev
am:
ee7a68c226
Change-Id: Id97e9869949cd88f2909266b38f7c5cf6e08072a
Sanket Padawe [Wed, 28 Jun 2017 17:46:34 +0000 (17:46 +0000)]
Merge "Fix memory alignment for dispatchImsCdmSms while sending data to vendor code." into oc-dr1-dev
pkanwar [Wed, 28 Jun 2017 05:25:09 +0000 (05:25 +0000)]
Radio Interface changes to allow the modem to query the framework for the key. am:
fb9166e2e3 -s ours
am:
c21943bf68 -s ours
Change-Id: I979fd2f14a34959a6642a02ec213c1f7cb293d6f
pkanwar [Wed, 28 Jun 2017 05:18:45 +0000 (05:18 +0000)]
Radio Interface changes to allow the modem to query the framework for the key.
am:
fb9166e2e3 -s ours
Change-Id: I530cb2b4a5e527c9247fea576cccbe02912e9ade
pkanwar [Sun, 21 May 2017 17:24:30 +0000 (10:24 -0700)]
Radio Interface changes to allow the modem to query the framework
for the key.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
(cherry picked from commit
d99e9284e93d2c687b17d733e3e0570bca9a23c8)
Merged-In: I670465878e01e382b074a6434fbaf1bcb0fecc65
Change-Id: I670465878e01e382b074a6434fbaf1bcb0fecc65
Sanket Padawe [Tue, 27 Jun 2017 21:53:22 +0000 (14:53 -0700)]
Fix memory alignment for dispatchImsCdmSms while sending data to vendor code.
Test: manually sending sms
Change-Id: I04baeace404cbe354745e8e253d18780ef7eacc4
Fix:
62811291
Nathan Harold [Tue, 27 Jun 2017 10:40:45 +0000 (10:40 +0000)]
Merge "Keepalive RIL Interface" into oc-dr1-dev am:
4c23d0acae
am:
f83995ce87
Change-Id: Ied5c239aa006ee132bd3177fd085bb7e2ebe6d4d
Nathan Harold [Tue, 27 Jun 2017 10:38:21 +0000 (10:38 +0000)]
Merge "Keepalive RIL Interface" into oc-dr1-dev
am:
4c23d0acae
Change-Id: Ied036b21e48e3c2c311818ae4993a505b0a60303
TreeHugger Robot [Tue, 27 Jun 2017 08:13:34 +0000 (08:13 +0000)]
Merge "Keepalive RIL Interface" into oc-dr1-dev
Nathan Harold [Thu, 8 Jun 2017 23:41:52 +0000 (16:41 -0700)]
Add cross-validation to IccCardStatusResponse
Verify that the card app indices are within the range
of the number of provided apps.
Bug:
62459080
Test: none
Change-Id: I07a89b440ebfbe5a00a1b493527506a573b7d09a
(cherry picked from commit
402dc021f7d80212fb7c3f9cb7349252e4ce4312)
yinxu [Tue, 27 Jun 2017 00:42:15 +0000 (00:42 +0000)]
Use direct assignment to replace memcpy am:
9c7ad93840 -s ours
am:
bebd5051a6 -s ours
Change-Id: I0913e0241fa9007e56eace6ae5510e5a86e8e0c0
yinxu [Mon, 26 Jun 2017 22:43:07 +0000 (22:43 +0000)]
Use direct assignment to replace memcpy
am:
9c7ad93840 -s ours
Change-Id: I12bcdcdf3fb98009910fc9b27319192e9621a750
Ying Xu [Fri, 23 Jun 2017 21:09:53 +0000 (21:09 +0000)]
Merge "Use direct assignment to replace memcpy" am:
d5461a4f08 am:
97abdd412e am:
a2140dacee
am:
787d56201b
Change-Id: I434483b2b821f538df3377d6781d8a34629bc3c0
yinxu [Fri, 23 Jun 2017 00:10:59 +0000 (17:10 -0700)]
Use direct assignment to replace memcpy
memcpy does not work here.
Test: Telephony sanity tests
Bug:
30954762
Cherry-picked cleanly from:
https://android-review.git.corp.google.com/#/c/421181/
Merged-in: I1e1048fc358bd57df2b230caef16ebf84e255c0a
Change-Id: I1e1048fc358bd57df2b230caef16ebf84e255c0a
(cherry picked from commit
dab316622f7459b94f1b4730a3f1266d88f29236)
Ying Xu [Fri, 23 Jun 2017 21:04:49 +0000 (21:04 +0000)]
Merge "Use direct assignment to replace memcpy" am:
d5461a4f08 am:
97abdd412e
am:
a2140dacee
Change-Id: I73fc3f1401c7dfad0f5fa577bd2ed4c3b5d7511c
Ying Xu [Fri, 23 Jun 2017 20:58:01 +0000 (20:58 +0000)]
Merge "Use direct assignment to replace memcpy" am:
d5461a4f08
am:
97abdd412e
Change-Id: I1065dc001b864b63e9841986078db208d2813943
Ying Xu [Fri, 23 Jun 2017 20:49:35 +0000 (20:49 +0000)]
Merge "Use direct assignment to replace memcpy"
am:
d5461a4f08
Change-Id: Ief307af0cca29e4609aad35aab29b59bb8a7ea4e
Ying Xu [Fri, 23 Jun 2017 20:40:47 +0000 (20:40 +0000)]
Merge "Use direct assignment to replace memcpy"
yinxu [Fri, 23 Jun 2017 00:10:59 +0000 (17:10 -0700)]
Use direct assignment to replace memcpy
memcpy does not work here.
Test: Telephony sanity tests
Bug:
30954762
Change-Id: I1e1048fc358bd57df2b230caef16ebf84e255c0a
Nathan Harold [Thu, 25 May 2017 23:10:35 +0000 (16:10 -0700)]
Keepalive RIL Interface
Interface definition for requesting and managing
keepalive packet offload to the modem.
Bug:
33277538
Test: tbd
Change-Id: Id42b8802750ca376d1d50431dec670f25c607174
(cherry picked from commit
6942b212a92d9d05a8100306acf9ea855818eb8d)
sqian [Wed, 21 Jun 2017 16:36:55 +0000 (16:36 +0000)]
Merge "Update ril.h documentation for vts" into oc-dr1-dev am:
44cdff12ff
am:
472657e58e -s ours
Change-Id: I149f6571673a65cb32599bbe20a5b12745c3f209
sqian [Wed, 21 Jun 2017 16:33:42 +0000 (16:33 +0000)]
Merge "Update ril.h documentation for vts" into oc-dr1-dev
am:
44cdff12ff
Change-Id: I9efb0ce906d070585bf022a5a2b57b7a75fe6bef
TreeHugger Robot [Wed, 21 Jun 2017 16:29:26 +0000 (16:29 +0000)]
Merge "Update ril.h documentation for vts" into oc-dr1-dev
Sanket Padawe [Wed, 21 Jun 2017 00:17:02 +0000 (00:17 +0000)]
Merge "Handle empty apn string in setInitialAttachApn HIDL API. am:
46e9ee36b6 am:
c4766a04fc" into oc-dr1-dev-plus-aosp
am:
f483bcdcf5
Change-Id: I94b934e27b347c891fa44cde9ec1f97d4ae549aa
Sanket Padawe [Wed, 21 Jun 2017 00:16:44 +0000 (00:16 +0000)]
Handle empty apn string in setInitialAttachApn HIDL API. am:
46e9ee36b6 am:
e492ca64cc
am:
3395d67b19
Change-Id: I40d6c2cc297899cd6df96e38686c27e059219f72
Android Build Merger (Role) [Wed, 21 Jun 2017 00:06:24 +0000 (00:06 +0000)]
Merge "Handle empty apn string in setInitialAttachApn HIDL API. am:
46e9ee36b6 am:
c4766a04fc" into oc-dr1-dev-plus-aosp
Sanket Padawe [Wed, 21 Jun 2017 00:06:15 +0000 (00:06 +0000)]
Handle empty apn string in setInitialAttachApn HIDL API. am:
46e9ee36b6
am:
e492ca64cc
Change-Id: I8cf01210435c56b88c3d0cf5508ca60cb926803e
Sanket Padawe [Wed, 21 Jun 2017 00:06:15 +0000 (00:06 +0000)]
Handle empty apn string in setInitialAttachApn HIDL API. am:
46e9ee36b6
am:
c4766a04fc
Change-Id: Ia993b034bc0c3c1eee4242616086632127f029bf
sqian [Tue, 20 Jun 2017 18:54:31 +0000 (11:54 -0700)]
Update ril.h documentation for vts
Update ril.h documentation for errors found by VTS
copy of https://partner-android-review.googlesource.com/#/c/836670/
+ extra update for some missed error code
+ request_not_supported
Bug:
35671595
Test: Manual
Change-Id: Ib444c357830ff4533716dfe12c1189fd32715da9
Merged-In: Ib444c357830ff4533716dfe12c1189fd32715da9
Sanket Padawe [Wed, 21 Jun 2017 00:02:14 +0000 (00:02 +0000)]
Handle empty apn string in setInitialAttachApn HIDL API.
am:
46e9ee36b6
Change-Id: Ie83142b6e724ce34f7ae3cddee35bbeba592fe04
Sanket Padawe [Wed, 21 Jun 2017 00:02:14 +0000 (00:02 +0000)]
Handle empty apn string in setInitialAttachApn HIDL API.
am:
46e9ee36b6
Change-Id: I2b066c9874b0e1c42808739ad378905fec69ee6d
TreeHugger Robot [Tue, 20 Jun 2017 23:06:28 +0000 (23:06 +0000)]
Merge "Update ril.h documentation for vts"
sqian [Tue, 20 Jun 2017 18:54:31 +0000 (11:54 -0700)]
Update ril.h documentation for vts
Update ril.h documentation for errors found by VTS
copy of https://partner-android-review.googlesource.com/#/c/836670/
+ extra update for some missed error code
+ request_not_supported
Bug:
35671595
Test: Manual
Change-Id: Ib444c357830ff4533716dfe12c1189fd32715da9
Sanket Padawe [Tue, 20 Jun 2017 19:40:19 +0000 (12:40 -0700)]
Handle empty apn string in setInitialAttachApn HIDL API.
Do not convert empty str to null in ril_service.cpp hidl conversion
as apn cannot be passed as null. QC expects empty apn string.
Change-Id: If9810f2d7741491e4ed440d20c95230e09a4b5d3
Fix:
62066962
Test: manual
Amit Mahajan [Mon, 19 Jun 2017 17:02:19 +0000 (17:02 +0000)]
Better handling for hal version 1.1 am:
ccb6d7fbf4
am:
edfa4376b9
Change-Id: I2b49ad0f75c0fe2b5e21dd806b7b92c8352da7f3
Amit Mahajan [Mon, 19 Jun 2017 16:56:47 +0000 (16:56 +0000)]
Better handling for hal version 1.1
am:
ccb6d7fbf4
Change-Id: Ib7d6ca5bd11532e1f75b54625298aa58d2362365
nharold [Fri, 16 Jun 2017 23:05:49 +0000 (23:05 +0000)]
Merge "Keepalive RIL Interface" am:
b507005da6 am:
6f664a9b21 am:
f9f24bb52c
am:
848a82847d
Change-Id: I1c58d49cfd971825a65be84a587ba0ef982941a0
nharold [Fri, 16 Jun 2017 22:46:32 +0000 (22:46 +0000)]
Merge "Keepalive RIL Interface" am:
b507005da6 am:
6f664a9b21
am:
f9f24bb52c
Change-Id: I3a2aa817d8e90450675a7f519e3e72b413022e9f
nharold [Fri, 16 Jun 2017 22:43:34 +0000 (22:43 +0000)]
Merge "Keepalive RIL Interface" am:
b507005da6
am:
6f664a9b21
Change-Id: I298c15b19403f5917de86632207bd3e3dda794ef
nharold [Fri, 16 Jun 2017 22:41:36 +0000 (22:41 +0000)]
Merge "Keepalive RIL Interface"
am:
b507005da6
Change-Id: I7a42b744506ec1d48d968b57ae1f400cacb94f17
nharold [Fri, 16 Jun 2017 22:37:19 +0000 (22:37 +0000)]
Merge "Keepalive RIL Interface"
Steven Moreland [Fri, 16 Jun 2017 01:48:06 +0000 (01:48 +0000)]
Merge "Fix loc of libreference-ril LOCAL_VENDOR_MODULE" am:
22f2df2fa0 am:
af4d205bd3 am:
c83d72d663 -s ours
am:
4c3299dbdb -s ours
Change-Id: I49492921195465b7911b23b9b97b36cbb3657c36
Steven Moreland [Fri, 16 Jun 2017 01:47:51 +0000 (01:47 +0000)]
Merge "Move librilutils to vendor." am:
fdbf7cd9f5 am:
ed4665aefc am:
53222f5d3d -s ours
am:
e790be8a10 -s ours
Change-Id: I72a278ff900aca043575acc543cfe3130897505b
Steven Moreland [Fri, 16 Jun 2017 01:38:06 +0000 (01:38 +0000)]
Merge "Fix loc of libreference-ril LOCAL_VENDOR_MODULE" am:
22f2df2fa0 am:
af4d205bd3
am:
c83d72d663 -s ours
Change-Id: I2ee10a0163573aa6c8ce39acfc763f83caecaf2a
Steven Moreland [Fri, 16 Jun 2017 01:37:54 +0000 (01:37 +0000)]
Merge "Move librilutils to vendor." am:
fdbf7cd9f5 am:
ed4665aefc
am:
53222f5d3d -s ours
Change-Id: I198bf4531d96b3c1b242a8a2cf056ed72998527b
Steven Moreland [Fri, 16 Jun 2017 01:34:37 +0000 (01:34 +0000)]
Merge "Fix loc of libreference-ril LOCAL_VENDOR_MODULE" am:
22f2df2fa0
am:
af4d205bd3
Change-Id: I24f5ca8c3ebe1e05818f360a3ab38cbf6733259a
Steven Moreland [Fri, 16 Jun 2017 01:34:23 +0000 (01:34 +0000)]
Merge "Move librilutils to vendor." am:
fdbf7cd9f5
am:
ed4665aefc
Change-Id: Id29bca8809bc4848b5386dafea9e7b3210e9d2b5
Steven Moreland [Fri, 16 Jun 2017 01:31:41 +0000 (01:31 +0000)]
Merge "Fix loc of libreference-ril LOCAL_VENDOR_MODULE"
am:
22f2df2fa0
Change-Id: I449eab180cd4e91f7223de3484514531569f6f58
Steven Moreland [Fri, 16 Jun 2017 01:31:23 +0000 (01:31 +0000)]
Merge "Move librilutils to vendor."
am:
fdbf7cd9f5
Change-Id: I3c528fc18db40808d32b5de4795dc945b23c784f
Treehugger Robot [Fri, 16 Jun 2017 01:23:18 +0000 (01:23 +0000)]
Merge "Fix loc of libreference-ril LOCAL_VENDOR_MODULE"
Treehugger Robot [Fri, 16 Jun 2017 01:23:12 +0000 (01:23 +0000)]
Merge "Move librilutils to vendor."
nharold [Fri, 16 Jun 2017 00:38:51 +0000 (00:38 +0000)]
Merge "Add cross-validation to IccCardStatusResponse" am:
476758da94 am:
c96af497ed am:
425fb9aa5e
am:
c39706dcca
Change-Id: Ibb4bf50212bd4ea23b6fe0c09cdb9729c8cdafb2
nharold [Fri, 16 Jun 2017 00:32:22 +0000 (00:32 +0000)]
Merge "Add cross-validation to IccCardStatusResponse" am:
476758da94 am:
c96af497ed
am:
425fb9aa5e
Change-Id: Iaaf5d5fdf372ffa19e334619876d100687a89e3a
nharold [Fri, 16 Jun 2017 00:29:20 +0000 (00:29 +0000)]
Merge "Add cross-validation to IccCardStatusResponse" am:
476758da94
am:
c96af497ed
Change-Id: I28df78c22ad3696f697652850e22d9235e13ed88
nharold [Fri, 16 Jun 2017 00:25:50 +0000 (00:25 +0000)]
Merge "Add cross-validation to IccCardStatusResponse"
am:
476758da94
Change-Id: Ib026ca0c4724c8b0ec90d1ba569ee2b86befad42
nharold [Fri, 16 Jun 2017 00:17:46 +0000 (00:17 +0000)]
Merge "Add cross-validation to IccCardStatusResponse"
Chih-hung Hsieh [Thu, 15 Jun 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Add OWNERS in hardware/ril" am:
96187f7271 am:
d495c7c7b7 am:
0164d1dcd8
am:
98f93f41f5
Change-Id: Ib1c98bcf3e21c58aa95a54757f94a3c33866f202
Chih-hung Hsieh [Thu, 15 Jun 2017 21:15:19 +0000 (21:15 +0000)]
Merge "Add OWNERS in hardware/ril" am:
96187f7271 am:
d495c7c7b7
am:
0164d1dcd8
Change-Id: I12166ed51ca81c74ef026a84167fc3b57a5e8eb7
Chih-hung Hsieh [Thu, 15 Jun 2017 21:12:45 +0000 (21:12 +0000)]
Merge "Add OWNERS in hardware/ril" am:
96187f7271
am:
d495c7c7b7
Change-Id: I6c1864c6372c67a52b53f8ded24c07b922d8c677
Chih-hung Hsieh [Thu, 15 Jun 2017 21:09:50 +0000 (21:09 +0000)]
Merge "Add OWNERS in hardware/ril"
am:
96187f7271
Change-Id: I8628465eefc3b039b8282c8f68d33833404e47f3
Chih-hung Hsieh [Thu, 15 Jun 2017 21:05:19 +0000 (21:05 +0000)]
Merge "Add OWNERS in hardware/ril"
Nathan Harold [Thu, 25 May 2017 23:10:35 +0000 (16:10 -0700)]
Keepalive RIL Interface
Interface definition for requesting and managing
keepalive packet offload to the modem.
Bug:
33277538
Test: tbd
Change-Id: Id42b8802750ca376d1d50431dec670f25c607174
Chih-Hung Hsieh [Thu, 15 Jun 2017 18:44:23 +0000 (11:44 -0700)]
Add OWNERS in hardware/ril
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I2913a58e488d305a793e0883e011aacf372c9d3f
Steven Moreland [Thu, 4 May 2017 01:07:35 +0000 (18:07 -0700)]
Fix loc of libreference-ril LOCAL_VENDOR_MODULE
Wasn't being applied before.
Test: build with BOARD_VNDK_VERSION current
Bug:
37429672
Merged-In: I4f55d4d165a5e14c46726c6325e704ca8a6ceebc
Change-Id: I4f55d4d165a5e14c46726c6325e704ca8a6ceebc
(cherry picked from commit
eeebae62179fe2085411fa7463615068bc19e8f6)
Steven Moreland [Tue, 18 Apr 2017 14:14:04 +0000 (07:14 -0700)]
Move librilutils to vendor.
Test: CleanSpec.mk works
Test: Works with BOARD_VNDK_VERSION := current
Test: Phone call works
Fixes:
37429672
Merged-In: I605732a88dc57132d8fa4bbfa70a3c9b47b0e0ff
Change-Id: I605732a88dc57132d8fa4bbfa70a3c9b47b0e0ff
(cherry picked from commit
4ef3e136c440153bb1173457f64bec9f2fecb81e)
Suren Baghdasaryan [Tue, 13 Jun 2017 22:41:43 +0000 (22:41 +0000)]
Merge "Use CALL_ONREQUEST in RadioImpl::setCarrierInfoForImsiEncryption"
Pankaj Kanwar [Tue, 13 Jun 2017 22:14:09 +0000 (22:14 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key." am:
9d64842e19 am:
06be9ba8d7 am:
f917c657de
am:
f51e23e7ca
Change-Id: I5ee41da9b633c1564b5842143a715b500b390e47
Pankaj Kanwar [Tue, 13 Jun 2017 20:50:28 +0000 (20:50 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key." am:
9d64842e19 am:
06be9ba8d7
am:
f917c657de
Change-Id: Ie9ec1ade9bc4d26614fe03e22c1232ad5ee1d062
Suren Baghdasaryan [Tue, 13 Jun 2017 18:12:07 +0000 (11:12 -0700)]
Use CALL_ONREQUEST in RadioImpl::setCarrierInfoForImsiEncryption
Use CALL_ONREQUEST instead of calling s_vendorFunctions->onRequest.
Test: make
Change-Id: I6df389f1810e3382b9e6f0abdb1b74962e590626
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Pankaj Kanwar [Tue, 13 Jun 2017 20:39:03 +0000 (20:39 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key." am:
9d64842e19
am:
06be9ba8d7
Change-Id: Ie7c31abeac3675a840779f262ba364461351fc98
Pankaj Kanwar [Tue, 13 Jun 2017 20:30:48 +0000 (20:30 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key."
am:
9d64842e19
Change-Id: I6a934d34cfd3c872d899749f61f36839dbe4b2d6
Pankaj Kanwar [Tue, 13 Jun 2017 20:22:22 +0000 (20:22 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key."
pkanwar [Sun, 21 May 2017 17:24:30 +0000 (10:24 -0700)]
Radio Interface changes to allow the modem to query the framework
for the key.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
Change-Id: I670465878e01e382b074a6434fbaf1bcb0fecc65
Pankaj Kanwar [Sun, 11 Jun 2017 18:13:01 +0000 (18:13 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key."
Amit Mahajan [Fri, 9 Jun 2017 17:44:54 +0000 (10:44 -0700)]
Better handling for hal version 1.1
Test: Basic telephony sanity
Bug:
62459058
Change-Id: I451d8e1c8cd07ce8a05d44e0e27cc30eab6bf7db
Amit Mahajan [Fri, 9 Jun 2017 07:39:01 +0000 (07:39 +0000)]
Merge "Merge "Treat NULL payload in RIL messages as valid where applicable." into oc-dev am:
65d3486b2f am:
6fe9ed5215" into oc-dr1-dev-plus-aosp
am:
887f506fce
Change-Id: I562a49705629f81ec781e94d87d7056857d91f71
Amit Mahajan [Fri, 9 Jun 2017 07:38:49 +0000 (07:38 +0000)]
Merge "Treat NULL payload in RIL messages as valid where applicable." into oc-dev am:
65d3486b2f am:
87d7f19912
am:
25f8259cfc
Change-Id: I6ca24bff1317132a4314f386af18bbb57c9792b4
Android Build Merger (Role) [Fri, 9 Jun 2017 07:30:09 +0000 (07:30 +0000)]
Merge "Merge "Treat NULL payload in RIL messages as valid where applicable." into oc-dev am:
65d3486b2f am:
6fe9ed5215" into oc-dr1-dev-plus-aosp
Amit Mahajan [Fri, 9 Jun 2017 07:30:00 +0000 (07:30 +0000)]
Merge "Treat NULL payload in RIL messages as valid where applicable." into oc-dev am:
65d3486b2f
am:
87d7f19912
Change-Id: I2b19bf5961ce09e2cd0f258349a0619607b208ca
Amit Mahajan [Fri, 9 Jun 2017 07:30:00 +0000 (07:30 +0000)]
Merge "Treat NULL payload in RIL messages as valid where applicable." into oc-dev am:
65d3486b2f
am:
6fe9ed5215
Change-Id: Idd5973102119eeb1c519982f11f67017f19bfc65
Amit Mahajan [Fri, 9 Jun 2017 07:27:29 +0000 (07:27 +0000)]
Merge "Treat NULL payload in RIL messages as valid where applicable." into oc-dev
am:
65d3486b2f
Change-Id: Ied5c1c63ba848ae88870be135a88de9a9baf5375
Amit Mahajan [Fri, 9 Jun 2017 07:27:29 +0000 (07:27 +0000)]
Merge "Treat NULL payload in RIL messages as valid where applicable." into oc-dev
am:
65d3486b2f
Change-Id: I604a461ba6d9d43730405ba5617afb6dcb871b39
TreeHugger Robot [Fri, 9 Jun 2017 07:23:33 +0000 (07:23 +0000)]
Merge "Treat NULL payload in RIL messages as valid where applicable." into oc-dev
Sooraj Sasindran [Fri, 9 Jun 2017 00:06:36 +0000 (00:06 +0000)]
Use Hex conversion for cid and lac am:
758ee46f08 am:
01fe6b31f8
am:
52b3c20da9
Change-Id: I3845d31e05229764dcbbb6371ded1512c6b6cdc2
Sooraj Sasindran [Thu, 8 Jun 2017 23:57:10 +0000 (23:57 +0000)]
Use Hex conversion for cid and lac am:
758ee46f08
am:
01fe6b31f8
Change-Id: I340efd4f0db1b0747631665e1660621ccf2a9383
Sooraj Sasindran [Thu, 8 Jun 2017 23:47:54 +0000 (23:47 +0000)]
Use Hex conversion for cid and lac am:
758ee46f08 am:
aacc2e78d8
am:
163c30cecf
Change-Id: I95facdc23c3bb96f69aae3dba61afdc48bf6f6c9
Sooraj Sasindran [Thu, 8 Jun 2017 23:46:17 +0000 (23:46 +0000)]
Use Hex conversion for cid and lac
am:
758ee46f08
Change-Id: Id3be1295f70bff4560554effe7684e48bd7b7f39
Sooraj Sasindran [Thu, 8 Jun 2017 23:44:24 +0000 (23:44 +0000)]
Use Hex conversion for cid and lac am:
758ee46f08
am:
aacc2e78d8
Change-Id: Iefcac19e8a9f3d265ecd0bec311f92d17007eb14
Sooraj Sasindran [Thu, 8 Jun 2017 23:42:55 +0000 (23:42 +0000)]
Use Hex conversion for cid and lac
am:
758ee46f08
Change-Id: I1de11843062178ecf5b5978e7d4292c5d338bba5
OSDN Git Service
