OSDN Git Service
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: 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 [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: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
Amit Mahajan [Thu, 8 Jun 2017 06:10:27 +0000 (23:10 -0700)]
Treat NULL payload in RIL messages as valid where applicable.
Test: basic telephony sanity
Bug:
62262047
Change-Id: Icdd199025b8890e8be66a18d47dff0f991ff4308
Sooraj Sasindran [Wed, 7 Jun 2017 23:30:18 +0000 (16:30 -0700)]
Use Hex conversion for cid and lac
Use Hex conversion for cid and lac
Bug=
37056478
Test: verified that cid and lacs given to applications
are same as what modem sent
Change-Id: I0ec8544f9c0425e97663cc24079be3d50b8a2aca
Mathieu Chartier [Mon, 5 Jun 2017 20:59:25 +0000 (13:59 -0700)]
Use CALL_ONREQUEST in RadioImpl::startNetworkScan
Use CALL_ONREQUEST instead of calling s_vendorFunctions->onRequest. This
fixes the gobo build.
Test: make
Bug:
62373887
Change-Id: Icd1c751efc25dbce15d374a08d0a025aaa4317fc
Ying Xu [Fri, 2 Jun 2017 00:34:54 +0000 (00:34 +0000)]
Merge "Implement the new network scan RIL API." am:
c2a8f44f11 am:
b377793c42 am:
4cb7768820
am:
72eab07f24
Change-Id: If7f2f612fe0bd968325bc5c4dde58162e6a3b0fb
Ying Xu [Fri, 2 Jun 2017 00:12:43 +0000 (00:12 +0000)]
Merge "Implement the new network scan RIL API." am:
c2a8f44f11 am:
b377793c42
am:
4cb7768820
Change-Id: Iad9b146efd346f6afb8a79c79724a11209c978a1
Ying Xu [Fri, 2 Jun 2017 00:10:09 +0000 (00:10 +0000)]
Merge "Implement the new network scan RIL API." am:
c2a8f44f11
am:
b377793c42
Change-Id: I557c7fefaaa508857d25725b1b959c3717ce29c9
Ying Xu [Fri, 2 Jun 2017 00:07:10 +0000 (00:07 +0000)]
Merge "Implement the new network scan RIL API."
am:
c2a8f44f11
Change-Id: Id566676da28e05aaa605b42dabc35140ea731779
Ying Xu [Thu, 1 Jun 2017 23:59:51 +0000 (23:59 +0000)]
Merge "Implement the new network scan RIL API."
Tao Wu [Thu, 1 Jun 2017 21:13:25 +0000 (21:13 +0000)]
Merge "Also setup IPv6 gateway for emulator." am:
f75ebd7434 am:
9b42a8c2d1 am:
a30b650899
am:
9ee260040c
Change-Id: Ice58078a225b1dbca0636a11d5973a081f4d8c64
Tao Wu [Thu, 1 Jun 2017 21:10:25 +0000 (21:10 +0000)]
Merge "Also setup IPv6 gateway for emulator." am:
f75ebd7434 am:
9b42a8c2d1
am:
a30b650899
Change-Id: I5ba96bb910231ad261cb0d1620f852f00ddaf889
Tao Wu [Thu, 1 Jun 2017 21:07:25 +0000 (21:07 +0000)]
Merge "Also setup IPv6 gateway for emulator." am:
f75ebd7434
am:
9b42a8c2d1
Change-Id: I62215b95dc99c255e347b3f32c68a2f057ba87d5
Tao Wu [Thu, 1 Jun 2017 21:04:26 +0000 (21:04 +0000)]
Merge "Also setup IPv6 gateway for emulator."
am:
f75ebd7434
Change-Id: Ie801c12aba0e1711851722c776927c9e38af658a
Treehugger Robot [Thu, 1 Jun 2017 20:53:08 +0000 (20:53 +0000)]
Merge "Also setup IPv6 gateway for emulator."
yinxu [Mon, 22 May 2017 18:26:45 +0000 (11:26 -0700)]
Implement the new network scan RIL API.
Test: Telephony sanity tests
Bug:
30954762
Change-Id: I3a4b7f7b642b266fb2c6f75bc3c7fd947dfe6ad0
Sanket Padawe [Wed, 24 May 2017 21:43:08 +0000 (21:43 +0000)]
Fix VTS test for setBarringPassword RIL api. am:
75e42a55ef
am:
1382f81732
Change-Id: If8a29c8e486f30be12ef8406dd9a029ccd9fc89a
Sanket Padawe [Wed, 24 May 2017 21:30:13 +0000 (21:30 +0000)]
Fix VTS test for setBarringPassword RIL api.
am:
75e42a55ef
Change-Id: I0100586fab946e7660570270bc356c0f985ace64
Sanket Padawe [Wed, 24 May 2017 17:03:55 +0000 (10:03 -0700)]
Fix VTS test for setBarringPassword RIL api.
Bug:
62054964
Test: manual
Change-Id: I05200a966badc3a67dec4c708b053464d943cd85
Tao Wu [Mon, 22 May 2017 21:06:06 +0000 (14:06 -0700)]
Also setup IPv6 gateway for emulator.
Without this, after switch on/off flight mode, emulator IPv6
network stops working.
Test: manual - switch of/off flight mode and then visit ipv6.google.com
Bug:
38496839
Change-Id: I3f33b0f8784a83ba99e25a0062f1829e9cfc0485
Signed-off-by: Tao Wu <lepton@google.com>
Amit Mahajan [Thu, 18 May 2017 19:08:52 +0000 (19:08 +0000)]
Fix multi sim support and warnings in new hal code. am:
93f603c4e1
am:
b863304d01 -s ours
Change-Id: Ib7d6bdd6af9c5d9b28c6b454365ebee73490574a
Amit Mahajan [Thu, 18 May 2017 19:01:07 +0000 (19:01 +0000)]
Fix multi sim support and warnings in new hal code.
am:
93f603c4e1
Change-Id: I140b9892eb75cafd84784bdfe1c1ab969f2ec799
Amit Mahajan [Thu, 18 May 2017 16:55:33 +0000 (16:55 +0000)]
Merge "Fix multi sim support and warnings in new hal code."
Amit Mahajan [Mon, 15 May 2017 23:41:44 +0000 (16:41 -0700)]
Fix multi sim support and warnings in new hal code.
Test: Basic telephony sanity for single sim
Bug:
38228839
Change-Id: I7df7ed41354b50f335a6f5fba7dffde03127b4f1
Amit Mahajan [Mon, 15 May 2017 23:41:44 +0000 (16:41 -0700)]
Fix multi sim support and warnings in new hal code.
Test: Basic telephony sanity for single sim
Bug:
38228839
Merged-in: I7df7ed41354b50f335a6f5fba7dffde03127b4f1
Change-Id: I7df7ed41354b50f335a6f5fba7dffde03127b4f1
sqian [Wed, 17 May 2017 21:52:07 +0000 (21:52 +0000)]
Merge "Remove GENERIC_FAILURE still in ril.h" am:
ad3f119378 am:
6a3db1ad1e am:
cb11038d87 -s ours
am:
991e200ed6
Change-Id: I21e509901ae238896ba936ff76ab6f227ea25bce
sqian [Wed, 17 May 2017 21:48:36 +0000 (21:48 +0000)]
Merge "Remove GENERIC_FAILURE still in ril.h" am:
ad3f119378 am:
6a3db1ad1e
am:
cb11038d87 -s ours
Change-Id: I14e0c2273b4b0a998abea112ee5c1608dea33c19
sqian [Wed, 17 May 2017 21:26:34 +0000 (21:26 +0000)]
Merge "Remove GENERIC_FAILURE still in ril.h" am:
ad3f119378
am:
6a3db1ad1e
Change-Id: I702352310892f5e88c0d28f0cf805c08f9c2a5af
sqian [Wed, 17 May 2017 21:23:33 +0000 (21:23 +0000)]
Merge "Remove GENERIC_FAILURE still in ril.h"
am:
ad3f119378
Change-Id: I64796efc91e47d6708796892671b1be0ff43f3fa
Treehugger Robot [Wed, 17 May 2017 21:08:34 +0000 (21:08 +0000)]
Merge "Remove GENERIC_FAILURE still in ril.h"
sqian [Mon, 24 Apr 2017 18:48:06 +0000 (11:48 -0700)]
Remove GENERIC_FAILURE still in ril.h
Bug:
36385785
Test: No change to behavior
Change-Id: I1757219bb758b3af694395fbba229cde74614f00
Ying Xu [Wed, 17 May 2017 18:20:48 +0000 (18:20 +0000)]
Merge "Define new network scan RIL API" am:
e466af58ac am:
88fddbd7e3 am:
bab9e8af9e
am:
4e71be6705
Change-Id: I50f657fb4770504491fac8afe51d863666727b9e
yinxu [Wed, 17 May 2017 18:17:48 +0000 (18:17 +0000)]
Define new network scan RIL API
am:
7317bd48d4 -s ours
Change-Id: I81fe83eacc3af3db1c27898059df7e98c44509e6
Ying Xu [Wed, 17 May 2017 17:31:31 +0000 (17:31 +0000)]
Merge "Define new network scan RIL API" am:
e466af58ac am:
88fddbd7e3
am:
bab9e8af9e
Change-Id: I563cbfeab1d3220111066a73e591b8e4c6375c6d
yinxu [Wed, 3 May 2017 22:15:19 +0000 (15:15 -0700)]
Define new network scan RIL API
This CL defines the RIL API for network scan and also includes dummy
stubs for the new API.
Test: Telephony Sanity Test
Bug:
30954762
Merged-in: Id276ca35d399c6860dc5f6413991ddf0ab3fd5e5
Change-Id: Id276ca35d399c6860dc5f6413991ddf0ab3fd5e5
(cherry picked from commit
3abe7c7b5ce788c112c5893734a5e0372a07991e)
(cherry picked from commit
584379e4cbfbfbaffd1a7be6d20ae6c685c925c5)
Ying Xu [Tue, 16 May 2017 23:21:47 +0000 (23:21 +0000)]
Merge "Define new network scan RIL API" am:
e466af58ac
am:
88fddbd7e3
Change-Id: I2f62af3e1bd7ec6948ee5dd349ffedb65eaf5495
Ying Xu [Tue, 16 May 2017 23:11:39 +0000 (23:11 +0000)]
Merge "Define new network scan RIL API"
am:
e466af58ac
Change-Id: I62632065cea6e647a80def7915682bdf6bb68af9
Ying Xu [Tue, 16 May 2017 23:04:39 +0000 (23:04 +0000)]
Merge "Define new network scan RIL API"
yinxu [Wed, 3 May 2017 22:15:19 +0000 (15:15 -0700)]
Define new network scan RIL API
This CL defines the RIL API for network scan and also includes dummy
stubs for the new API.
Test: Telephony Sanity Test
Bug:
30954762
Change-Id: Id276ca35d399c6860dc5f6413991ddf0ab3fd5e5
(cherry picked from commit
3abe7c7b5ce788c112c5893734a5e0372a07991e)
Grace Chen [Tue, 16 May 2017 20:08:30 +0000 (20:08 +0000)]
Merge "Support different SIM power states" am:
df82df8ff4 am:
0770994e46 am:
eb0c18c9e0
am:
6eebee18a7 -s ours
Change-Id: Ib5303f2f4864ca49a7a0c099a5dc38aab5da0f4f
Grace Chen [Tue, 16 May 2017 19:57:03 +0000 (19:57 +0000)]
Merge "Support different SIM power states" am:
df82df8ff4 am:
0770994e46
am:
eb0c18c9e0
Change-Id: Iab3b109cfb8973428b00b915fe062085f8522b11
Grace Chen [Tue, 16 May 2017 19:50:55 +0000 (19:50 +0000)]
Merge "Support different SIM power states" am:
df82df8ff4
am:
0770994e46
Change-Id: I8a4c315f18dfc5fd918e503f49d6d6b0ecb655d2
Grace Chen [Tue, 16 May 2017 19:42:50 +0000 (19:42 +0000)]
Merge "Support different SIM power states"
am:
df82df8ff4
Change-Id: I62e054cfc05a0e74fb42655389e40b1c0d02812b
Grace Chen [Tue, 16 May 2017 19:30:25 +0000 (19:30 +0000)]
Merge "Support different SIM power states"
Grace Chen [Fri, 24 Mar 2017 01:39:48 +0000 (18:39 -0700)]
Support different SIM power states
Test: Verify SIM power states
Bug:
35844036
Merged-In: Iabdbcba2572a481537c47da536b66a4b99365511
Change-Id: Iabdbcba2572a481537c47da536b66a4b99365511
Naveen Kalla [Fri, 12 May 2017 22:52:24 +0000 (22:52 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message" am:
e6e95633a9 am:
45cba67df3 am:
bcb71f3324 -s ours
am:
007b92af66 -s ours
Change-Id: If4f81ea1e028002dce27cca00e15d7ec56ba8151
Naveen Kalla [Fri, 12 May 2017 22:46:03 +0000 (22:46 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message" am:
e6e95633a9 am:
45cba67df3
am:
bcb71f3324 -s ours
Change-Id: Iecd49e6762e8e35731b6b15afc4ac334f8ab63f8
Naveen Kalla [Fri, 12 May 2017 22:39:07 +0000 (22:39 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message" am:
e6e95633a9
am:
45cba67df3
Change-Id: I68bfbc4b31534573f66f5ccace53332c67f89fd1
Naveen Kalla [Fri, 12 May 2017 22:31:43 +0000 (22:31 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message"
am:
e6e95633a9
Change-Id: I082cb6ccf49038da6891f7293083b7af0f5e078d
Treehugger Robot [Fri, 12 May 2017 22:25:25 +0000 (22:25 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message"
Naveen Kalla [Wed, 14 Sep 2016 20:41:04 +0000 (13:41 -0700)]
Add RIL_UNSOL_MODEM_RESTART message
RIL_UNSOL_MODEM_RESTART will be sent by vendor RILs when it detects
a modem restart along with the reason for restart which could be a
crash signature if the modem restarted due to a crash or a some
other string such as a user-initiated restart or AT command
initiated restart.
Test: Manual
Merged-In: I21310be011ec9df395cc1fc95c6c96dbfba86792
Change-Id: I21310be011ec9df395cc1fc95c6c96dbfba86792
yinxu [Wed, 3 May 2017 22:15:19 +0000 (15:15 -0700)]
Define new network scan RIL API
This CL defines the RIL API for network scan and also includes dummy
stubs for the new API.
Test: Telephony Sanity Test
Bug:
30954762
Change-Id: Id276ca35d399c6860dc5f6413991ddf0ab3fd5e5
Naina Nalluri [Thu, 11 May 2017 01:49:24 +0000 (01:49 +0000)]
Update ril.h documentation am:
6772858ab5
am:
6abf6f0e6f
Change-Id: I02ff0b8453b5cf9215c059f62d91ae06985943b4
Naina Nalluri [Thu, 11 May 2017 00:56:06 +0000 (00:56 +0000)]
Update ril.h documentation
am:
6772858ab5
Change-Id: I2fd6d8c1a04e90d5d782b4db474ebd4ee661aefd
TreeHugger Robot [Wed, 10 May 2017 17:43:57 +0000 (17:43 +0000)]
Merge "Support different SIM power states"
Naina Nalluri [Fri, 5 May 2017 00:40:04 +0000 (17:40 -0700)]
Update ril.h documentation
update ril.h documentation with
nas/data error codes
Bug:
35671595
Test: Only Doc update
Change-Id: I966db0db7051b6c76544ed9dae6edd10e5a3c5a0
Grace Chen [Fri, 24 Mar 2017 01:39:48 +0000 (18:39 -0700)]
Support different SIM power states
Test: Verify SIM power states
Bug:
35844036
Change-Id: Iabdbcba2572a481537c47da536b66a4b99365511
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
Change-Id: I4f55d4d165a5e14c46726c6325e704ca8a6ceebc
Jayachandran Chinnakkannu [Mon, 1 May 2017 20:39:46 +0000 (20:39 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" into oc-dev am:
350bc81a8e
am:
545257900c
Change-Id: Icdb6ac2bb29bf68c301e602e3498e485e255162e
Jayachandran Chinnakkannu [Mon, 1 May 2017 20:37:08 +0000 (20:37 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" into oc-dev
am:
350bc81a8e
Change-Id: I3bb49f8e0e86843141e437352558a09e17e54f43
Jayachandran Chinnakkannu [Mon, 1 May 2017 20:32:02 +0000 (20:32 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" into oc-dev
Jayachandran C [Mon, 1 May 2017 19:21:45 +0000 (19:21 +0000)]
Do not treat NULL response as error for getAllowedCarriers am:
4709430fbe
am:
93b4ddc466
Change-Id: Ide8b1178785269d8ae388aa65c3a8f568ef50ad9
Jayachandran C [Mon, 1 May 2017 19:19:12 +0000 (19:19 +0000)]
Do not treat NULL response as error for getAllowedCarriers
am:
4709430fbe
Change-Id: Iede7269e0aa02f76f5aac7579c745045899c890a
Jayachandran C [Fri, 28 Apr 2017 07:57:13 +0000 (00:57 -0700)]
Do not treat NULL response as error for getAllowedCarriers
NULL is a valid response in RIL_REQUEST_GET_CARRIER_RESTRICTIONS
as per RIL.h. NULL implies all carriers are allowed. This fix skips
setting error if response is NULL to fix VTS failure.
Test: VTS
Bug:
37849113
Bug:
37157801
Change-Id: Ida3d2d0f10693ed396b236ac9512afb277ce2ddb
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:45:25 +0000 (16:45 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" am:
cea6432601 am:
41fb22dcb4 am:
1eb054537d
am:
934d417a3c
Change-Id: I07390214a501fcf27ca881e52f49212759ef7ff5
Jayachandran C [Sun, 30 Apr 2017 17:21:14 +0000 (10:21 -0700)]
Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG
Test: VTS
Bug:
37849113
Bug:
37157801
Change-Id: I6e2f384751973457775ab8c084189bddd59d0dd3
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:42:55 +0000 (16:42 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" am:
cea6432601 am:
41fb22dcb4
am:
1eb054537d
Change-Id: I979a311b8590095f24934b5ff2381cc6900bab6b
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:40:55 +0000 (16:40 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG" am:
cea6432601
am:
41fb22dcb4
Change-Id: If18665bef8b157bfb58d3380ce4ddef7d36b723b
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:38:25 +0000 (16:38 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG"
am:
cea6432601
Change-Id: I2ce1574fc0fa12db61441c0f245183e9b09b2bae
Jayachandran Chinnakkannu [Mon, 1 May 2017 16:33:28 +0000 (16:33 +0000)]
Merge "Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG"
Jayachandran C [Sun, 30 Apr 2017 17:21:14 +0000 (10:21 -0700)]
Convert ResetNvType to RIL.h values of RIL_REQUEST_NV_RESET_CONFIG
Test: VTS
Bug:
37157801
Change-Id: I6e2f384751973457775ab8c084189bddd59d0dd3
Meng Wang [Fri, 28 Apr 2017 22:48:08 +0000 (22:48 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers" am:
e1bdb3ff16 am:
2579380c88 am:
cbfb65f7cc
am:
0688f9eb03
Change-Id: Ic95696a8a0af8bb71c3ed2d33d92ab3ccbeff838
Meng Wang [Fri, 28 Apr 2017 22:43:38 +0000 (22:43 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers" am:
e1bdb3ff16 am:
2579380c88
am:
cbfb65f7cc
Change-Id: Ic1fe6f3c559b26f26f3aa9335a04836be969abff
Meng Wang [Fri, 28 Apr 2017 22:37:38 +0000 (22:37 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers" am:
e1bdb3ff16
am:
2579380c88
Change-Id: I90ec89ab5fb4d781e05cfcdfc4293b993333fcf3
Meng Wang [Fri, 28 Apr 2017 22:30:53 +0000 (22:30 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers"
am:
e1bdb3ff16
Change-Id: If32eef2b16e89b4a3a6c308588597e8f415ad2db
Meng Wang [Fri, 28 Apr 2017 22:25:51 +0000 (22:25 +0000)]
Merge "Do not treat NULL response as error for getAllowedCarriers"
Jayachandran C [Fri, 28 Apr 2017 07:57:13 +0000 (00:57 -0700)]
Do not treat NULL response as error for getAllowedCarriers
NULL is a valid response in RIL_REQUEST_GET_CARRIER_RESTRICTIONS
as per RIL.h. NULL implies all carriers are allowed. This fix skips
setting error if response is NULL to fix VTS failure.
Test: VTS
Bug:
37157801
Change-Id: Ida3d2d0f10693ed396b236ac9512afb277ce2ddb
pkanwar [Thu, 27 Apr 2017 21:22:25 +0000 (21:22 +0000)]
resolve merge conflicts of
ee186e9 to oc-dev-plus-aosp
am:
2a6951e07f -s ours
Change-Id: Ib0e235f4f34fea50c641855774c01ace3368af93
pkanwar [Thu, 27 Apr 2017 20:15:56 +0000 (13:15 -0700)]
resolve merge conflicts of
ee186e9 to oc-dev-plus-aosp
Change-Id: I6f4b2606cc2f4e985a33f629e7861121b32a9952
Test: manual
Bug:
35606429
Pankaj Kanwar [Thu, 27 Apr 2017 17:58:55 +0000 (17:58 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key." am:
71460d3e6a
am:
5e428e83a1
Change-Id: I66a58266858ae9211ec7b03f6df3f8d5b3bdd017
Pankaj Kanwar [Thu, 27 Apr 2017 17:49:49 +0000 (17:49 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key."
am:
71460d3e6a
Change-Id: I51277fc92b964ac8e0c0df62d186af674a0cf0e9
Pankaj Kanwar [Thu, 27 Apr 2017 17:41:56 +0000 (17:41 +0000)]
Merge "Radio Interface changes to allow the modem to query the framework for the key."
pkanwar [Fri, 17 Mar 2017 19:49:34 +0000 (12:49 -0700)]
Radio Interface changes to allow the modem to query the framework
for the key.
This CL adds the 1.1 version of the HAL interface. It also introduces
support for 2 new messags:
1. setCarrierInfoForImsiEncryption
2. carrierInfoForImsiEncryption
BUG:
35606429
Test: manual
Change-Id: Iad02a20081e8bd1b8daaac396d20d888f8567252
Merged-In: I1d953914c23f8a1d94cc85e023ead3fd3c036ec5
Pankaj Kanwar [Wed, 26 Apr 2017 22:33:27 +0000 (22:33 +0000)]
Merge "Radio Interface to query for the public key."
pkanwar [Fri, 17 Mar 2017 19:49:34 +0000 (12:49 -0700)]
Radio Interface to query for the public key.
This CL adds the 1.1 version of the HAL interface. It also introduces
support for 2 new messags:
1. setCarrierInfoForImsiEncryption
2. carrierInfoForImsiEncryption
BUG:
35606429
Test: manual
Change-Id: I1d953914c23f8a1d94cc85e023ead3fd3c036ec5
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
Change-Id: I605732a88dc57132d8fa4bbfa70a3c9b47b0e0ff
sqian [Mon, 24 Apr 2017 23:19:23 +0000 (23:19 +0000)]
Remove GENERIC_FAILURE still in ril.h am:
2e093616e8
am:
ba70869b53
Change-Id: I8aefecec0d105c98647cd2ccfd2f1847b254941f
sqian [Mon, 24 Apr 2017 22:46:08 +0000 (22:46 +0000)]
Remove GENERIC_FAILURE still in ril.h
am:
2e093616e8
Change-Id: Ia6c9a8836b2c4d87fb576840fdb45bac2653ad9d
sqian [Mon, 24 Apr 2017 18:48:06 +0000 (11:48 -0700)]
Remove GENERIC_FAILURE still in ril.h
Bug:
36385785
Test: No change to behavior
Change-Id: I1757219bb758b3af694395fbba229cde74614f00
Steven Moreland [Thu, 20 Apr 2017 15:54:57 +0000 (15:54 +0000)]
Merge changes from topic 'system-vendor-internal-pick' am:
0ce4693d8f am:
d92a0e60d2 am:
b4b6846c61
am:
c9c675b5f1
Change-Id: I789ba7b09abae510e6045ab5d654b8830227381e
Steven Moreland [Thu, 20 Apr 2017 15:54:52 +0000 (15:54 +0000)]
Move libril to the vendor partition. am:
f9185eebbb am:
8c6e560755 am:
0862947d3f
am:
7f2808964c
Change-Id: I2c8a0ef652d6ab921ec05ca3b9f29f200d60f5ad
Steven Moreland [Thu, 20 Apr 2017 04:21:37 +0000 (04:21 +0000)]
Merge changes from topic 'system-vendor-internal-pick' am:
0ce4693d8f am:
d92a0e60d2
am:
b4b6846c61
Change-Id: I82788a246e3427137942367a8597b1fbd8922764
Steven Moreland [Thu, 20 Apr 2017 04:21:33 +0000 (04:21 +0000)]
Move libril to the vendor partition. am:
f9185eebbb am:
8c6e560755
am:
0862947d3f
Change-Id: I05a573e6103c8508a55b5b4cee17bc67298e150f
Steven Moreland [Thu, 20 Apr 2017 01:59:27 +0000 (01:59 +0000)]
Merge changes from topic 'system-vendor-internal-pick' am:
0ce4693d8f
am:
d92a0e60d2
Change-Id: I0c96476ca98301f839ec0b2cf7a84e00b24985e2
Steven Moreland [Thu, 20 Apr 2017 01:59:24 +0000 (01:59 +0000)]
Move libril to the vendor partition. am:
f9185eebbb
am:
8c6e560755
Change-Id: Ic52897cc2252fad71bd9fdd7e818906bc358f1a0