OSDN Git Service
Dan Willemsen [Wed, 5 Apr 2017 22:47:32 +0000 (22:47 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" into oc-dev
am:
494dd2187e
Change-Id: I5646ee063b226bf2d47a4a7cd1e153a66e810c36
TreeHugger Robot [Wed, 5 Apr 2017 22:42:16 +0000 (22:42 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" into oc-dev
Amit Mahajan [Wed, 5 Apr 2017 17:56:00 +0000 (17:56 +0000)]
Change radio related service names to slot1, slot2, slot3...
am:
35e9310a95
Change-Id: Ice26de5d28bbe09f6ed68f63e0d9792b2c51878f
Dan Willemsen [Tue, 4 Apr 2017 04:58:13 +0000 (21:58 -0700)]
rild.c: Use log/log.h instead of utils/Log.h
This doesn't use libutils, so it shouldn't be using the libutils
headers. It doesn't use anything unique to utils/Log.h anyways.
It also shouldn't be using any headers from TARGET_OUT_HEADERS (aka
LOCAL_COPY_HEADERS)
Test: m -j rild
Change-Id: I64ef29cdc17a32e013bccfa799cb9c125386cf50
Amit Mahajan [Tue, 28 Mar 2017 18:17:55 +0000 (11:17 -0700)]
Change radio related service names to slot1, slot2, slot3...
Test: Basic telephony sanity
Bug:
36570718
Merged-in: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Change-Id: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Amit Mahajan [Tue, 4 Apr 2017 22:26:21 +0000 (15:26 -0700)]
resolve merge conflicts of
77eb76c to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic7897aba8a92273bd5939417628963ef2304556f
Amit Mahajan [Tue, 4 Apr 2017 22:10:03 +0000 (22:10 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..." am:
25f66a9aa9
am:
bb37d407b8
Change-Id: Iec0c53a8b1d2363a531f29079c4d98dcb7ac9f62
Amit Mahajan [Tue, 4 Apr 2017 22:07:33 +0000 (22:07 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..."
am:
25f66a9aa9
Change-Id: I643d505b3338e977abf6b7a8af07bfe609753d8a
Treehugger Robot [Tue, 4 Apr 2017 22:01:37 +0000 (22:01 +0000)]
Merge "Change radio related service names to slot1, slot2, slot3..."
Amit Mahajan [Tue, 28 Mar 2017 18:17:55 +0000 (11:17 -0700)]
Change radio related service names to slot1, slot2, slot3...
Test: Basic telephony sanity
Bug:
36570718
Merged-in: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Change-Id: Ia3c3f7b3e2cedd05bafa2d335f9c04e831da0cf4
Dan Willemsen [Tue, 4 Apr 2017 16:38:19 +0000 (16:38 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" am:
210d7d9059 am:
35a9183f59
am:
2ef2ec65b1
Change-Id: Ic95e1868489b0564d994d2f927eb017cf288a6a2
Dan Willemsen [Tue, 4 Apr 2017 16:34:19 +0000 (16:34 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h" am:
210d7d9059
am:
35a9183f59
Change-Id: I74f36b5a112fb024efff6897354126fb784bb7d6
Dan Willemsen [Tue, 4 Apr 2017 16:29:48 +0000 (16:29 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h"
am:
210d7d9059
Change-Id: Ie9ae3d51dda35dd29ac2a78b52e432811b111f9f
Dan Willemsen [Tue, 4 Apr 2017 16:24:17 +0000 (16:24 +0000)]
Merge "rild.c: Use log/log.h instead of utils/Log.h"
Dan Willemsen [Tue, 4 Apr 2017 04:58:13 +0000 (21:58 -0700)]
rild.c: Use log/log.h instead of utils/Log.h
This doesn't use libutils, so it shouldn't be using the libutils
headers. It doesn't use anything unique to utils/Log.h anyways.
It also shouldn't be using any headers from TARGET_OUT_HEADERS (aka
LOCAL_COPY_HEADERS)
Test: m -j rild
Change-Id: I64ef29cdc17a32e013bccfa799cb9c125386cf50
Steven Moreland [Wed, 29 Mar 2017 06:22:39 +0000 (06:22 +0000)]
SapImpl: log error description
am:
c7aaac2316 -s ours
Change-Id: I7c7dcd675bc3111776da856c1ba07825a9a2d1a9
Steven Moreland [Wed, 29 Mar 2017 02:19:54 +0000 (02:19 +0000)]
Merge "SapImpl: log error description" am:
b3e6a478ff am:
8d0438cb9c
am:
9a184aad03
Change-Id: Ie8a59145f82446adfd909dd1e3db5d4b6275bfa8
Steven Moreland [Wed, 29 Mar 2017 02:17:24 +0000 (02:17 +0000)]
Merge "SapImpl: log error description" am:
b3e6a478ff
am:
8d0438cb9c
Change-Id: Ided83b9ace1ed50e500d6d0f05b93b6a7d271653
Steven Moreland [Wed, 29 Mar 2017 02:15:24 +0000 (02:15 +0000)]
Merge "SapImpl: log error description"
am:
b3e6a478ff
Change-Id: Ibd4c8aa2c39e4c55e666392fc7d2bf98927cd461
Treehugger Robot [Wed, 29 Mar 2017 02:10:07 +0000 (02:10 +0000)]
Merge "SapImpl: log error description"
Steven Moreland [Tue, 28 Mar 2017 15:55:58 +0000 (08:55 -0700)]
SapImpl: log error description
Test: pass
Bug:
35937742
Change-Id: I9784a15d8de5dc8a0bff849d5d3ef8c162bcb1a0
Steven Moreland [Tue, 28 Mar 2017 15:55:58 +0000 (08:55 -0700)]
SapImpl: log error description
Test: pass
Bug:
35937742
Merged-In: I9784a15d8de5dc8a0bff849d5d3ef8c162bcb1a0
Change-Id: I9784a15d8de5dc8a0bff849d5d3ef8c162bcb1a0
Amit Mahajan [Tue, 28 Mar 2017 05:22:24 +0000 (05:22 +0000)]
Merge "Remove SAP socket." am:
3ca9bd02b8 am:
8de5ac7bae
am:
94521c910a -s ours
Change-Id: Idd5018862f6fbc1d19aee464692dd653dc92f10f
Amit Mahajan [Tue, 28 Mar 2017 05:14:00 +0000 (05:14 +0000)]
Merge "Remove SAP socket." am:
3ca9bd02b8
am:
8de5ac7bae
Change-Id: I574d84aeba4c22fd58a84704da2f55c5307cf5e4
Amit Mahajan [Tue, 28 Mar 2017 05:06:12 +0000 (05:06 +0000)]
Merge "Remove SAP socket."
am:
3ca9bd02b8
Change-Id: I602d5f3506c716445371dfa19ac6aa20c16f2386
Amit Mahajan [Tue, 28 Mar 2017 04:56:37 +0000 (04:56 +0000)]
Merge "Remove SAP socket."
Amit Mahajan [Wed, 22 Mar 2017 18:25:51 +0000 (11:25 -0700)]
Remove SAP socket.
Test: Basic SAP sanity
Bug:
32020264
Merged-in: Iece9d047db513e425e8a954e2ece2bba7e3e2535
Change-Id: Iece9d047db513e425e8a954e2ece2bba7e3e2535
Amit Mahajan [Wed, 22 Mar 2017 18:25:51 +0000 (11:25 -0700)]
Remove SAP socket.
Test: Basic SAP sanity
Bug:
32020264
Change-Id: Iece9d047db513e425e8a954e2ece2bba7e3e2535
Jayachandran Chinnakkannu [Sun, 26 Mar 2017 02:40:46 +0000 (02:40 +0000)]
Merge "Move RILC logs under verbose flag to reduce the RILC log spam" am:
13bbab0ddb am:
66f6695c0b
am:
5005c1be3a
Change-Id: I5fc323b460adc4dc3ce98fa6905679223a1490e9
Jayachandran Chinnakkannu [Sun, 26 Mar 2017 02:38:15 +0000 (02:38 +0000)]
Merge "Move RILC logs under verbose flag to reduce the RILC log spam" am:
13bbab0ddb
am:
66f6695c0b
Change-Id: I86f8faf313d4ad2da78825ed3e4395d4a70c5885
Jayachandran Chinnakkannu [Sun, 26 Mar 2017 02:35:46 +0000 (02:35 +0000)]
Merge "Move RILC logs under verbose flag to reduce the RILC log spam"
am:
13bbab0ddb
Change-Id: I9630182957c8c4f4932573c936aca029919b5eb8
Jayachandran Chinnakkannu [Sun, 26 Mar 2017 02:32:18 +0000 (02:32 +0000)]
Merge "Move RILC logs under verbose flag to reduce the RILC log spam"
Jayachandran C [Sat, 25 Mar 2017 21:30:13 +0000 (14:30 -0700)]
Move RILC logs under verbose flag to reduce the RILC log spam
This change moves most of RLOGD prints under VDGB flag
Test: Verified that the RILC log spam is reduced
Bug:
36613198
Change-Id: Ife7042b523a445605b297ed244d0f884d0b39179
Shuo Qian [Fri, 24 Mar 2017 17:30:29 +0000 (17:30 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h" am:
6ea410309a am:
d00910aad5
am:
3d696d8e42
Change-Id: Idcbb37672a64e933a2f78c7fc34c5f93f1eeab74
Shuo Qian [Fri, 24 Mar 2017 17:27:56 +0000 (17:27 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h" am:
6ea410309a
am:
d00910aad5
Change-Id: Ic9729c06688b50f73be99a27d701cff3f25d8e47
Shuo Qian [Fri, 24 Mar 2017 17:26:28 +0000 (17:26 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h"
am:
6ea410309a
Change-Id: I695aaa62900d55ad23b271860aa672fd9a3d0a6a
Shuo Qian [Fri, 24 Mar 2017 17:21:17 +0000 (17:21 +0000)]
Merge "Removing GENERIC_FAILURE from API documentation in ril.h"
Shuoq [Mon, 20 Mar 2017 23:31:23 +0000 (16:31 -0700)]
Removing GENERIC_FAILURE from API documentation in ril.h
GENERIC_FAILURE should not be returned in any case.
Bug:
36385785
Test: No change to behavior
Change-Id: I5d3da76aadf9f2643d1e2ca5ca1d8f741e7a25c5
Amit Mahajan [Wed, 22 Mar 2017 17:03:11 +0000 (17:03 +0000)]
Merge "Remove rild sockets." am:
7c22062ff6 am:
7662321cbf
am:
82b7efe9e2 -s ours
Change-Id: I2c50eda23201bada91e89b1cf196ed19e62beae4
Amit Mahajan [Wed, 22 Mar 2017 17:00:18 +0000 (17:00 +0000)]
Merge "Remove rild sockets." am:
7c22062ff6
am:
7662321cbf
Change-Id: I023a53e5d1aa535683bc409a1f99b972c5f7db74
Amit Mahajan [Wed, 22 Mar 2017 16:58:39 +0000 (16:58 +0000)]
Merge "Remove rild sockets."
am:
7c22062ff6
Change-Id: I5d2833330cb606f6379d2af42806c97a8632312a
Amit Mahajan [Wed, 22 Mar 2017 16:54:40 +0000 (16:54 +0000)]
Merge "Remove rild sockets."
Amit Mahajan [Tue, 14 Mar 2017 23:39:27 +0000 (16:39 -0700)]
Remove rild sockets.
Test: Basic telephony sanity
Bug:
32020264
Merged-in: Icff46cadab085ca7882ed32ee0c6f9247a028817
Change-Id: Icff46cadab085ca7882ed32ee0c6f9247a028817
Amit Mahajan [Tue, 14 Mar 2017 23:39:27 +0000 (16:39 -0700)]
Remove rild sockets.
Test: Basic telephony sanity
Bug:
32020264
Change-Id: Icff46cadab085ca7882ed32ee0c6f9247a028817
Naveen Kalla [Mon, 20 Mar 2017 04:39:20 +0000 (04:39 +0000)]
Merge "Convert empty response to -1 for some SIM APIs" am:
7e18f92330 am:
2c7bc41c4c
am:
6fc12e7833
Change-Id: I3dcf8ed7d7c68645986c61cafb8c92707708f6d2
Naveen Kalla [Mon, 20 Mar 2017 04:34:05 +0000 (04:34 +0000)]
Merge "Convert empty response to -1 for some SIM APIs" am:
7e18f92330
am:
2c7bc41c4c
Change-Id: I1ce70a847c0b3afd0728db95bcc917927188fb1a
Naveen Kalla [Mon, 20 Mar 2017 04:31:04 +0000 (04:31 +0000)]
Merge "Convert empty response to -1 for some SIM APIs"
am:
7e18f92330
Change-Id: Id483483cce600cafa1c392e2027abd9ba140c863
Naveen Kalla [Mon, 20 Mar 2017 04:24:45 +0000 (04:24 +0000)]
Merge "Convert empty response to -1 for some SIM APIs"
Naveen Kalla [Thu, 16 Mar 2017 19:55:55 +0000 (12:55 -0700)]
Convert empty response to -1 for some SIM APIs
Earlier RILs did not send a response for some cases although the
interface expected an integer as response. Do not return error if
response is empty. Instead Return -1 in those cases to maintain backward
compatibility.
Bug:
36209518
Test: Enable fixed dialing number and call barring by dialing *35*PASSWORD#.
Check logs to make sure RILC does not fail with invalid response
on devices where RIL doesn't send a response to these requests
on success.
Change-Id: I1d91bacd60bd19985710a111de57e86f03e6ce4a
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:41:44 +0000 (22:41 +0000)]
Merge "Add new precise call fail causes and OEM causes" am:
8f1c83e068 am:
f1c740adec
am:
166d45018d
Change-Id: Icd5f5acf344f6a97f5e9ec79e1b5ec0ff0a8a696
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:34:09 +0000 (22:34 +0000)]
Merge "Add new precise call fail causes and OEM causes" am:
8f1c83e068
am:
f1c740adec
Change-Id: Ib7bdc7f571ee6b8a9214c11a2fc24986d62bc134
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:27:20 +0000 (22:27 +0000)]
Merge "Add new precise call fail causes and OEM causes"
am:
8f1c83e068
Change-Id: Ia52fb715455da05dc813e70807bf8f2304e3c9e1
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:18:22 +0000 (22:18 +0000)]
Merge "Add new precise call fail causes and OEM causes"
Amit Mahajan [Fri, 17 Mar 2017 21:19:08 +0000 (21:19 +0000)]
Merge "Fix for race condition between radio and oemhook services." am:
b809efa3ad am:
79127b86a7
am:
ac4dc62c1a
Change-Id: I2bafcfe18565ca88966bc718df5b99988c723712
Amit Mahajan [Fri, 17 Mar 2017 21:14:42 +0000 (21:14 +0000)]
Merge "Fix for race condition between radio and oemhook services." am:
b809efa3ad
am:
79127b86a7
Change-Id: Ic1d0a7adfa4880ffc8a6dd52bb330b941a4897a4
Amit Mahajan [Fri, 17 Mar 2017 21:11:33 +0000 (21:11 +0000)]
Merge "Fix for race condition between radio and oemhook services."
am:
b809efa3ad
Change-Id: Iab8c04c954342377acfda76c48b5d2d7cf5cccc7
Amit Mahajan [Fri, 17 Mar 2017 21:01:26 +0000 (21:01 +0000)]
Merge "Fix for race condition between radio and oemhook services."
Amit Mahajan [Fri, 17 Mar 2017 00:04:01 +0000 (17:04 -0700)]
Fix for race condition between radio and oemhook services.
The race condition was this:
1. Phone process crashes and restarts
2. Phone process calls IRadio.setResponseFunctions()
3. oemHookInd is sent from vendor RIL. At this point oemHook
callbacks are stale, and due to that the callback fails and
sets callback objects to NULL, including the IRadio ones which is
not correct.
Test: Basic telephony sanity. The condition was easily reproducible
on angler; verified that it works fine now.
Bug:
32020264
Change-Id: I33bbdf01b19d009530c78baae90188acb4986d15
Jayachandran C [Tue, 7 Mar 2017 17:55:58 +0000 (09:55 -0800)]
Add new precise call fail causes and OEM causes
Bug:
35609963
Change-Id: I46ffc8280a25286aedf311c5e63d9c7748849f3b
Steven Moreland [Fri, 17 Mar 2017 16:48:19 +0000 (16:48 +0000)]
Merge "Remove unused using statement." am:
fa396bcdd1 am:
4317579734
am:
16cc438e97
Change-Id: I476990f78e8b12816242a16ce03dc4a709d90ade
Steven Moreland [Fri, 17 Mar 2017 16:45:22 +0000 (16:45 +0000)]
Merge "Remove unused using statement." am:
fa396bcdd1
am:
4317579734
Change-Id: I9631a84002158b6d6ec5dcac426cd4dcf661249a
Steven Moreland [Fri, 17 Mar 2017 16:40:53 +0000 (16:40 +0000)]
Merge "Remove unused using statement."
am:
fa396bcdd1
Change-Id: I23b09f11e2673d9aabfeef7bd545b8649e2ad7f0
Treehugger Robot [Fri, 17 Mar 2017 16:35:22 +0000 (16:35 +0000)]
Merge "Remove unused using statement."
Steven Moreland [Thu, 16 Mar 2017 07:58:34 +0000 (00:58 -0700)]
Remove unused using statement.
Test: pass
Bug:
36099713
Change-Id: Iaacfa2d2ce8555e191850a620f75111cb2d108a5
Jayachandran Chinnakkannu [Wed, 15 Mar 2017 21:40:42 +0000 (21:40 +0000)]
Merge "Return meaningful error code for RIL_REQUEST_QUERY_AVAILABLE_NETWORKS" am:
fb4080b38a am:
e0f223e1ff
am:
11ffff00b0
Change-Id: Icefb283432fba0d7a9db36e131eb9e7232554918
Jayachandran Chinnakkannu [Wed, 15 Mar 2017 21:38:04 +0000 (21:38 +0000)]
Merge "Return meaningful error code for RIL_REQUEST_QUERY_AVAILABLE_NETWORKS" am:
fb4080b38a
am:
e0f223e1ff
Change-Id: I7f98ad7f7510f90e19616627059dc1faaf1f004c
Jayachandran Chinnakkannu [Wed, 15 Mar 2017 21:33:06 +0000 (21:33 +0000)]
Merge "Return meaningful error code for RIL_REQUEST_QUERY_AVAILABLE_NETWORKS"
am:
fb4080b38a
Change-Id: I0b95e007ca4f4f3a9815daba4ba9fd8fbf4645a1
Jayachandran Chinnakkannu [Wed, 15 Mar 2017 21:28:06 +0000 (21:28 +0000)]
Merge "Return meaningful error code for RIL_REQUEST_QUERY_AVAILABLE_NETWORKS"
Jayachandran C [Tue, 14 Mar 2017 02:17:18 +0000 (19:17 -0700)]
Return meaningful error code for RIL_REQUEST_QUERY_AVAILABLE_NETWORKS
Updated documentation for INTERNAL_ERR & MODEM_ERR
Bug:
34102797
Change-Id: If1ac0f50eb3e3a21056d137e060a8fccb24304c2
Amit Mahajan [Tue, 14 Mar 2017 18:48:06 +0000 (18:48 +0000)]
Merge "Return Void() from oneway APIs." am:
bf2acac2b6 am:
e8006aa5a2
am:
f6f6682795
Change-Id: I725d7576993ae39619b3e8ecf1432bfc6429c0ac
Amit Mahajan [Tue, 14 Mar 2017 18:42:07 +0000 (18:42 +0000)]
Merge "Return Void() from oneway APIs." am:
bf2acac2b6
am:
e8006aa5a2
Change-Id: I9be037e23ff78a615b56fe69b09f24a1946616d5
Amit Mahajan [Tue, 14 Mar 2017 18:37:36 +0000 (18:37 +0000)]
Merge "Return Void() from oneway APIs."
am:
bf2acac2b6
Change-Id: I8e3ae858184b33c4f3ceceec651ae20586c45aaf
Amit Mahajan [Tue, 14 Mar 2017 18:30:41 +0000 (18:30 +0000)]
Merge "Return Void() from oneway APIs."
Amit Mahajan [Tue, 14 Mar 2017 00:01:05 +0000 (17:01 -0700)]
Return Void() from oneway APIs.
Test: none
Bug:
36162904
Change-Id: I323633c398085f96d265666136d451a33d683e51
Sooraj Sasindran [Fri, 10 Mar 2017 03:17:21 +0000 (03:17 +0000)]
Merge "Use cid and lac to update ci and tac for LTE" am:
010cb31cb9 am:
fe3b590ba8
am:
74d68dc147
Change-Id: I5bb29ae9414459ad5a0f85858bdb7b0ade319846
Sooraj Sasindran [Fri, 10 Mar 2017 03:12:47 +0000 (03:12 +0000)]
Merge "Use cid and lac to update ci and tac for LTE" am:
010cb31cb9
am:
fe3b590ba8
Change-Id: I03eaa241ed8b04d55b3b87719bf619925ee2ecd2
Sooraj Sasindran [Fri, 10 Mar 2017 03:10:19 +0000 (03:10 +0000)]
Merge "Use cid and lac to update ci and tac for LTE"
am:
010cb31cb9
Change-Id: I699fb50370c1d0b226305a64f92dc776a1f6bbab
Sooraj Sasindran [Fri, 10 Mar 2017 03:05:18 +0000 (03:05 +0000)]
Merge "Use cid and lac to update ci and tac for LTE"
Sanket Padawe [Wed, 8 Mar 2017 21:27:18 +0000 (21:27 +0000)]
Merge "Fix bug in getCallWaiting api." am:
eb4e5318f2 am:
1ee4605786
am:
10fa551a31
Change-Id: I7cf3130d2302d4ce24cd51109e848d9cb1312fed
Sanket Padawe [Wed, 8 Mar 2017 21:24:48 +0000 (21:24 +0000)]
Merge "Fix bug in getCallWaiting api." am:
eb4e5318f2
am:
1ee4605786
Change-Id: If75c7a23571a549afa1f13ac38c1d1d5db11fb3b
Sanket Padawe [Wed, 8 Mar 2017 21:22:18 +0000 (21:22 +0000)]
Merge "Fix bug in getCallWaiting api."
am:
eb4e5318f2
Change-Id: I4f58581d06f4aab34a92fc026b913b71df3bf191
Sanket Padawe [Wed, 8 Mar 2017 21:16:20 +0000 (21:16 +0000)]
Merge "Fix bug in getCallWaiting api."
Sanket Padawe [Wed, 8 Mar 2017 01:21:05 +0000 (17:21 -0800)]
Fix bug in getCallWaiting api.
Test: Build and local VTS.
Bug:
32020264
Change-Id: I9933b2d45a124e4f0704b987af49bab3bdcb3418
Nathan Harold [Wed, 8 Mar 2017 00:12:19 +0000 (00:12 +0000)]
Merge "Fix signed-unsigned comparison" am:
65ca78d761 am:
a5a92a782a
am:
70097bc66b
Change-Id: Ifb9f557f022894095263cc87c68e509d78adc2df
Nathan Harold [Wed, 8 Mar 2017 00:10:18 +0000 (00:10 +0000)]
Merge "Fix signed-unsigned comparison" am:
65ca78d761
am:
a5a92a782a
Change-Id: I6fa2a7da4e5f9575d9596265972de731ee47b0f3
Nathan Harold [Wed, 8 Mar 2017 00:07:46 +0000 (00:07 +0000)]
Merge "Fix signed-unsigned comparison"
am:
65ca78d761
Change-Id: I08a44c8eab98ea633e6cab6cda287178fcc0ff3c
Treehugger Robot [Wed, 8 Mar 2017 00:02:16 +0000 (00:02 +0000)]
Merge "Fix signed-unsigned comparison"
Amit Mahajan [Tue, 7 Mar 2017 19:03:35 +0000 (19:03 +0000)]
Merge "Delete Parcel references and other unused code." am:
3f82483b46 am:
7e3f057955
am:
a2a28fc9a1
Change-Id: Ied9853efa067f891789b75fe99c09314f24e5aa6
Amit Mahajan [Tue, 7 Mar 2017 19:01:34 +0000 (19:01 +0000)]
Merge "Delete Parcel references and other unused code." am:
3f82483b46
am:
7e3f057955
Change-Id: I017c395f345d0af5a181e94ce03a22d92bf6e174
Amit Mahajan [Tue, 7 Mar 2017 18:59:35 +0000 (18:59 +0000)]
Merge "Delete Parcel references and other unused code."
am:
3f82483b46
Change-Id: Ib1251078a87525d13824fbe79399c8fcf9b1a5a5
Amit Mahajan [Tue, 7 Mar 2017 18:55:17 +0000 (18:55 +0000)]
Merge "Delete Parcel references and other unused code."
Sooraj Sasindran [Tue, 7 Mar 2017 07:07:22 +0000 (23:07 -0800)]
Use cid and lac to update ci and tac for LTE
As per older RIL interface LTE cid and lac were filled
using ci and tac. Hence use the same while converting
voice registration state.
Test: ran unit testing
verified on device that registration state is
reported correctly
Bug:
32223344
Change-Id: I74ea670ff51ceaf0387cdf3b9cafc5601ab54d98
Jack Yu [Tue, 7 Mar 2017 02:49:14 +0000 (02:49 +0000)]
Merge "Removed the deprecated screen state API" am:
c10809781f am:
01504d76c6
am:
0af2e62449
Change-Id: Icd65c95b4a615b054a97e7fc4eb4e7c429bca70d
Jack Yu [Tue, 7 Mar 2017 02:45:53 +0000 (02:45 +0000)]
Merge "Removed the deprecated screen state API" am:
c10809781f
am:
01504d76c6
Change-Id: I45abe7e5551cc611bde2c0cb3dbf0c46045e1914
Jack Yu [Tue, 7 Mar 2017 02:43:35 +0000 (02:43 +0000)]
Merge "Removed the deprecated screen state API"
am:
c10809781f
Change-Id: Ibb832b779b8f417552bd131085e46d5039d168bc
Jack Yu [Tue, 7 Mar 2017 00:30:11 +0000 (00:30 +0000)]
Merge "Removed the deprecated screen state API"
Amit Mahajan [Sat, 4 Mar 2017 01:35:47 +0000 (17:35 -0800)]
Delete Parcel references and other unused code.
Test: Basic telephony sanity
Bug:
32020264
Change-Id: I410988c7f347fcca2770d9b099f489bd6d625d0b
Amit Mahajan [Fri, 3 Mar 2017 21:53:09 +0000 (21:53 +0000)]
Merge "Remove unnecessary prefix from log lines since LOG_TAG is added." am:
f658608533 am:
fb37291f6f
am:
f6877aca9a
Change-Id: I71a1d2e3e70f7e06efdbae0248e52b206b888e82
Amit Mahajan [Fri, 3 Mar 2017 21:50:09 +0000 (21:50 +0000)]
Merge "Remove unnecessary prefix from log lines since LOG_TAG is added." am:
f658608533
am:
fb37291f6f
Change-Id: Ib2d7ad54e7146807c9938b371d0541627a9116ec
Amit Mahajan [Fri, 3 Mar 2017 21:47:08 +0000 (21:47 +0000)]
Merge "Remove unnecessary prefix from log lines since LOG_TAG is added."
am:
f658608533
Change-Id: I524a87ca2b633ded4200ca6b0b7f7555df75789f