Commit Graph

4420 Commits

Author SHA1 Message Date
Hall Liu
b2a5eceb2f Merge "Add new error codes in MbmsException" am: 8e7057ccf3 am: 20d98578f2
am: aac7e3a182

Change-Id: Ie426c6334590f30656166b0a7851fe75fa3d4684
2017-05-27 01:31:58 +00:00
Hall Liu
20d98578f2 Merge "Add new error codes in MbmsException"
am: 8e7057ccf3

Change-Id: Ie8bf825d1fe7c40c94abd0245e69d597afb2f9bc
2017-05-27 01:18:33 +00:00
Hall Liu
8e7057ccf3 Merge "Add new error codes in MbmsException" 2017-05-27 01:08:31 +00:00
Hall Liu
80a8687a87 Add new error codes in MbmsException
Test: builds
Change-Id: I523961f588ef5ada97e06f5a910875c123f97989
2017-05-26 15:49:32 -07:00
Brad Ebinger
095f72cc4c Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840
am: 689edc736f

Change-Id: Ifd9fc089d7165506f6953e810c040de868f5bafe
2017-05-25 23:10:21 +00:00
Brad Ebinger
be34238840 Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
am: 25ce41cf4c

Change-Id: Ic24b93e215995a18e1a2ecbb647af0cc8e1f67cb
2017-05-25 22:51:11 +00:00
Brad Ebinger
25ce41cf4c Merge "Add IMEI_NOT_ACCEPTED error code for IMS" 2017-05-25 22:31:53 +00:00
Brad Ebinger
8187781e37 Merge "Support RRO for emergency number conversion map" am: 671680e504 am: 8498a6cffd
am: ddd73513e6

Change-Id: Id41d327b54fdf95c86a4f6e8d3727b79b98a2d5b
2017-05-24 20:39:46 +00:00
Brad Ebinger
8498a6cffd Merge "Support RRO for emergency number conversion map"
am: 671680e504

Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82
2017-05-24 20:27:48 +00:00
Brad Ebinger
671680e504 Merge "Support RRO for emergency number conversion map" 2017-05-24 20:19:32 +00:00
Jack Yu
d35fccce64 Merge "Added IWLAN metered APN support" am: 70fe11fc38 am: ab48527680
am: b8f3e388fc

Change-Id: Ia03104b1604bb34c6993171e848aa6193409726a
2017-05-23 03:39:49 +00:00
Jack Yu
ab48527680 Merge "Added IWLAN metered APN support"
am: 70fe11fc38

Change-Id: I12573353fca921d1454d6829302a379cd6b2cc8b
2017-05-23 01:10:29 +00:00
Jack Yu
89c04b52f5 Added IWLAN metered APN support
If the device is in IWLAN mode, when checking if the APN
type is metered, we read the settings from the IWLAN
metered APN list.

Test: Telephony unit tests
bug: 38304530

Merged-In: I46c9e1a15dd0dd40811d5a959d558fc78608b127
Change-Id: I46c9e1a15dd0dd40811d5a959d558fc78608b127
2017-05-22 16:52:24 -07:00
Hall Liu
3ae2ef069e Merge "Implement stopStreaming API for MBMS" am: e245bf9067 am: a7fffdc0d9
am: efa377cbb6

Change-Id: I1a845cfdeef7bd53beb4fa9b49eebe7a06386622
2017-05-19 22:53:42 +00:00
Hall Liu
a7fffdc0d9 Merge "Implement stopStreaming API for MBMS"
am: e245bf9067

Change-Id: I4b70f26a5579ddf3af7d426a04aea8ba33312790
2017-05-19 22:40:22 +00:00
Hall Liu
e245bf9067 Merge "Implement stopStreaming API for MBMS" 2017-05-19 22:32:04 +00:00
Hall Liu
edbd456c04 Implement stopStreaming API for MBMS
Test: testapps
Change-Id: Ic0477bf489a89a67697a318ff0fab065e0327e08
2017-05-18 17:41:05 -07:00
Przemyslaw Szczepaniak
3a9f256329 resolve merge conflicts of 2ce1b38e85 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia1eb0590edf2b074f6cbf16060cda2257091edd8
2017-05-18 10:57:09 +01:00
Przemyslaw Szczepaniak
ab0f6fc5d2 Merge "Consolidated all data allow/disallow logic into one method"
am: 449d73251f

Change-Id: I861d75dad60ab83039aa06565141a2eb5b294386
2017-05-18 09:07:24 +00:00
Jack Yu
bd7d89c133 Consolidated all data allow/disallow logic into one method
Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.

Test: Telephony sanity tests and unit tests
bug: 33847610
Merged-In: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
Change-Id: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
2017-05-17 21:16:39 -07:00
yinxu
5a798bc18a Add the new RIL requests and NetworkScanResult.
Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Merged-in: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb402)
(cherry picked from commit 84c9e01f10)
2017-05-16 23:02:39 -07:00
Ying Xu
a37b511b67 Merge "Add the new RIL requests and NetworkScanResult."
am: 0727abc423

Change-Id: I41560f522b3c46de4fe1a7a8377a6f2b7af04534
2017-05-16 23:11:24 +00:00
yinxu
84c9e01f10 Add the new RIL requests and NetworkScanResult.
Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb402)
2017-05-16 13:34:59 -07:00
Hall Liu
4b1d35035d Merge "startStreaming for MBMS apis" am: 4b3c44be55 am: 0a4740ec5c
am: 624290d3c8

Change-Id: I6cddee57736b27dfcf88537f4e602d4bf6bc81aa
2017-05-16 20:05:41 +00:00
Grace Chen
73b63bd5ac Merge "Support different SIM power states" am: 0517b719bc am: 1bbe5b21f3
am: c742ab7a44

Change-Id: I71d696c6c725e65357f0704047d534cfc69973d6
2017-05-16 19:58:37 +00:00
Hall Liu
0a4740ec5c Merge "startStreaming for MBMS apis"
am: 4b3c44be55

Change-Id: Id0e2e95387300147ba32ec3a418605901fdb241b
2017-05-16 19:52:26 +00:00
Hall Liu
4b3c44be55 Merge "startStreaming for MBMS apis" 2017-05-16 19:45:12 +00:00
Grace Chen
1bbe5b21f3 Merge "Support different SIM power states"
am: 0517b719bc

Change-Id: Icb6db4d805b4aea701a803eaaec716954f2ebf2a
2017-05-16 19:42:42 +00:00
Grace Chen
0517b719bc Merge "Support different SIM power states" 2017-05-16 19:30:28 +00:00
Grace Chen
b282179000 Support different SIM power states
Test: Verify SIM power states
Bug:  35844036
Merged-In: I968269e88eec40af6e3ca71cbb805a77e016da0f
Change-Id: I968269e88eec40af6e3ca71cbb805a77e016da0f
2017-05-16 10:48:15 -07:00
Hall Liu
fb1ee0ebb2 startStreaming for MBMS apis
Clean up MBMS APIs a bit and make things functional for the
startStreaming/getPlaybackUri APIs.

Test: testapps
Change-Id: I141a4114cc912b98ae22aefb760346061e286f1a
2017-05-15 16:48:52 -07:00
Hall Liu
deeda1e353 Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162
am: 7e80c3f00b

Change-Id: Id3359056c247288825ec672963b538cfaa121937
2017-05-15 22:35:04 +00:00
Hall Liu
762e0c1162 Merge "Change signalStrength to int."
am: 73818566d6

Change-Id: I8a9afddc749afc216dc1dc16f0465df1d0dab24f
2017-05-15 22:14:59 +00:00
Hall Liu
73818566d6 Merge "Change signalStrength to int." 2017-05-15 22:01:21 +00:00
Hall Liu
7780b9bced Merge "Remove switchStreams API." am: f465d84ebe am: 48941f5d90
am: 3b867ed0b3

Change-Id: Id3ff5e2609d4acd2226f6717745951f704f1e6b2
2017-05-15 21:00:33 +00:00
Hall Liu
48941f5d90 Merge "Remove switchStreams API."
am: f465d84ebe

Change-Id: Ia2cd7338087ee5283d2241ec260d0649ccd3f2b2
2017-05-15 20:41:45 +00:00
Hall Liu
f465d84ebe Merge "Remove switchStreams API." 2017-05-15 20:22:57 +00:00
Ying Xu
061a71a0b4 Merge "Add API to support async network scans." am: 625d5a9dd9 am: 8d692eb811
am: 31aff5459b

Change-Id: I416017e17a3e1cd837541440ef0ac44c5184dad2
2017-05-15 17:20:58 +00:00
Ying Xu
8d692eb811 Merge "Add API to support async network scans."
am: 625d5a9dd9

Change-Id: Iac369e26f707e59095ae7a89bfb11324e12634dc
2017-05-15 17:04:43 +00:00
Ying Xu
625d5a9dd9 Merge "Add API to support async network scans." 2017-05-15 16:57:07 +00:00
Jayachandran Chinnakkannu
72edfe46fe Merge "Add new reason code for IMS Call ended during conference merge process" into oc-dev
am: a1755c4fd6

Change-Id: I4643358d6823fe56c31ac279ce34fe18710c4889
2017-05-13 00:49:11 +00:00
Robert Greenwalt
e50f946632 Change signalStrength to int.
Broadcast signal strength is calculated differently than unicast
so the SignalStrength class used for unicast doesn't make sense.
Also added a -1 constant for unavailable which is mainly used
when the service is delivered via unicast.

Also rename signalStrengthUpdated to broadcastSignalStrengthUpdated.

Test: builds
Change-Id: Ia2680370d4cb8cd838341f58b41d02cdc78d4fc1
2017-05-12 17:30:52 -07:00
Naveen Kalla
e174804841 Merge "Add RIL_UNSOL_MODEM_RESTART message"
am: 85e188585e

Change-Id: I33dd05658ad8c9eed74e42ab27fa248a5942b688
2017-05-12 22:32:53 +00:00
Robert Greenwalt
4a411f7d67 Remove switchStreams API.
After discussion about how best this could fit in the API we
discovered many disagreements that we couldn't resolve in the
time available.  Pulling the feature from the API until we
can resolve issues.

Test: builds
Change-Id: I6d36a1dea8ce9816fad497b992a347188d3ac88e
2017-05-12 15:04:04 -07:00
yinxu
f19bc1a0e5 Add API to support async network scans.
This CL includes the new Java API that supports async network scans.
Applications could get faster network scan results with this new API.
The long-term goal is to support Subsecond Switching which is separate
from what this CL is doing.

Bug: 30954762
Test: Unit test, run runtest -x NetworkScanRequestTest.java
Change-Id: I78cadaf838dee8439fe7417ef39f689990bf5705
(cherry picked from commit fdfb6f4d2f)
2017-05-12 15:01:02 -07:00
Naveen Kalla
d9b212630c 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: Idf08e20a49e82d40f6aa0854d23384c35c2efc3a
Change-Id: Idf08e20a49e82d40f6aa0854d23384c35c2efc3a
2017-05-12 13:57:19 -07:00
Toshiya Ikenaga
464157757a Add IMEI_NOT_ACCEPTED error code for IMS
Bug: 38256949
Change-Id: Ib14bd9f3e6b26db7c27170c56ec65e96c18abd67
2017-05-12 15:03:24 +00:00
Hall Liu
cf4e147769 Merge "getStreamingServices for embms" am: b73fe9a751 am: 1d274ca5ec
am: a73e417752

Change-Id: I027359f2f9591ca1600b9b270413ae9b74fb7909
2017-05-12 03:30:07 +00:00
nharold
c5c4f5a45e Merge "Add hidden APIs to get the cached SignalStrength from SST" am: 5b8a9c873f am: cca5fbe779
am: 8d361350ff

Change-Id: Ief9ba9b1fcd36db763d403c60be53b42c3d18890
2017-05-12 03:18:54 +00:00
Chen Xu
6771979e22 Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0
am: 44cb5df46f

Change-Id: I3a7b4f735da8c92a839e6d4f3a00378f68397fa6
2017-05-12 02:08:51 +00:00