Commit Graph

4387 Commits

Author SHA1 Message Date
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
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
Hall Liu
1d274ca5ec Merge "getStreamingServices for embms"
am: b73fe9a751

Change-Id: I391004c1ee0e5815147349f488b537ed4d645e73
2017-05-12 01:52:29 +00:00
Hall Liu
b73fe9a751 Merge "getStreamingServices for embms" 2017-05-12 01:00:29 +00:00
nharold
cca5fbe779 Merge "Add hidden APIs to get the cached SignalStrength from SST"
am: 5b8a9c873f

Change-Id: I8a17af3ea66d723c2f7dfb14848b19b3fd1fc0ef
2017-05-12 00:19:11 +00:00
nharold
5b8a9c873f Merge "Add hidden APIs to get the cached SignalStrength from SST" 2017-05-11 23:57:16 +00:00
Brad Ebinger
e050b5196b Merge "Add key for carrier_volte_provisioned"
am: 79d3648cc2

Change-Id: Id83abfcabfcbad1bd34b22251403b9555d1b8e9e
2017-05-11 21:56:07 +00:00
Brad Ebinger
79d3648cc2 Merge "Add key for carrier_volte_provisioned" 2017-05-11 21:20:30 +00:00
Chen Xu
1f354082c0 Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2"
am: 7eca824ce3

Change-Id: I153e490abc6a37fabfdb51fddc195ed15cec85fb
2017-05-11 20:59:21 +00:00
Jayachandran C
666a12f423 Add new reason code for IMS Call ended during conference merge process
Test: Following scenarios for VoLTE and CS call and
      verified the cause sent in PreciseCallState.

 1) Conference call merge
 2) Conference call, one remote party ends the call
 3) Conference call, all remote parties end the call
 4) Conference call, hangup locally
 5) Normal call and hangup locally
 6) Normal call and remote party ends the call

Bug: 38225047
Change-Id: I36edb0cbff4b130b0942a46dc6c15a7d842789c2
2017-05-11 13:23:26 -07:00
Chen Xu
7eca824ce3 Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" 2017-05-11 19:15:51 +00:00
Chaitanya Saggurthi
df03aeb346 Telephony: Fix the failure of copying SMS to SIM card for sub2
While copying SMS of sub2 to its SIM memory, in process of getting
current Phonetype will return default sub's(i.e,sub1's)Phonetype. But
we want to get sub2's Phonetype here.

To fix this, get current Phonetype based on subscription id

Test: manual - Copy SMS to SIM card of sub2

Bug: 35025520
Change-Id: If415530d3f74dd357054cae6eb9c3ce8f7727342
2017-05-11 11:50:44 +05:30
Jordan Liu
5b07cb3542 Add key for carrier_volte_provisioned
Add the key to CarrierConfigManager and remove old configs.

Bug: 29873049
Change-Id: Icf3075fe39d3466732ea81738cb29c512f840401
Merged-In: Icf3075fe39d3466732ea81738cb29c512f840401
2017-05-10 17:40:19 -07:00
Brad Ebinger
da21d753c7 Merge "Notify ImsService Status Correctly" into oc-dev
am: 9684d718fa

Change-Id: Ia056fd9cc30e673056e7e9b5140c498bb6abce1b
2017-05-10 23:54:32 +00:00
Brad Ebinger
6d249dc08c Merge "Notify ImsService Status Correctly"
am: 1bb9181380

Change-Id: I694072b5125151cd1db6b88774c09126199e7cc0
2017-05-10 23:48:12 +00:00
Hall Liu
8023332b01 getStreamingServices for embms
Add code to pipe through getStreamingServices for EMBMS and improve
documentation.

Test: testapps
Change-Id: I5248b69fda0cfdb10ffdc4f6952a1da52b47a716
2017-05-10 16:46:52 -07:00
Brad Ebinger
1bb9181380 Merge "Notify ImsService Status Correctly" 2017-05-10 23:00:54 +00:00
Nathan Harold
fb8d0e934d Add hidden APIs to get the cached SignalStrength from SST
Add APIs in TelephonyManager to pull the SignalStrength that is
currently cached in ServiceStateTracker

Bug: 36133439
Test: tested with sl4a
Change-Id: I6adbecb8126a715da836fcde7f832fedb2f06bc3
2017-05-10 21:34:03 +00:00
Hall Liu
3afb78704a Merge "Increase limit of locale pairs" am: aa9a59ab32 am: 22ff1759d2
am: dba95b0c94

Change-Id: I7135571a65625f3aa3ada7a0c1b00f08c565fce9
2017-05-10 18:58:23 +00:00
Robert Greenwalt
688ae17c11 Merge "Update startStreaming to return status code" am: 6476ceeaee am: a89cacebfb
am: 331058a871

Change-Id: Ie2bc9f47e7774a838829720379fc5865e71d2f0f
2017-05-10 17:50:17 +00:00
Hall Liu
22ff1759d2 Merge "Increase limit of locale pairs"
am: aa9a59ab32

Change-Id: I4f9d25169bbd7e53c5396e944613e8c15fe4e308
2017-05-10 17:15:31 +00:00
Robert Greenwalt
a89cacebfb Merge "Update startStreaming to return status code"
am: 6476ceeaee

Change-Id: I92f8fad5bff456b158ba2afd55c3065678b0d5cf
2017-05-10 17:11:12 +00:00
Hall Liu
aa9a59ab32 Merge "Increase limit of locale pairs" 2017-05-10 16:46:19 +00:00
Treehugger Robot
6476ceeaee Merge "Update startStreaming to return status code" 2017-05-10 16:46:14 +00:00
Brad Ebinger
eca799105f Notify ImsService Status Correctly
Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.

Bug: 38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
2017-05-10 16:45:14 +00:00
Brad Ebinger
e1b49b7654 Notify ImsService Status Correctly
Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.

Bug: 38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
2017-05-10 16:41:20 +00:00
Hall Liu
f5bd3d9d42 Merge "Changes to MbmsStreamingManager for test app" am: df57734354 am: 244912f414
am: 7249a96ce4

Change-Id: Ie9793c74f211c553bdf892a34889844792879946
2017-05-10 01:50:14 +00:00
Hall Liu
244912f414 Merge "Changes to MbmsStreamingManager for test app"
am: df57734354

Change-Id: I661e2cb4609f556d31e464d1cadff459b9b80354
2017-05-10 01:05:26 +00:00
Hall Liu
df57734354 Merge "Changes to MbmsStreamingManager for test app" 2017-05-10 00:50:49 +00:00
Robert Greenwalt
f725f98f17 Increase limit of locale pairs
This is just to avoid people injecting arbitrarily large
numbers here and causing crashes due to memory limitation.
Raised to a high enough level to avoid chance of hitting in practice.

Test: build
Change-Id: I1d2a245f9c391a9d6aec52bddd3dc086206d3e30
2017-05-08 16:44:08 -07:00
Robert Greenwalt
ff6c0e697c Update startStreaming to return status code
The StreamingService object will be constructed by the manager code.

Test: build
Change-Id: I53e321dbae14270d0df2c81774bf7f055baf216f
2017-05-08 16:41:38 -07:00
nharold
d38615b846 Merge changes from topic 'sms-files-move-opt-to-base'
am: abcc43d86a

Change-Id: Ib61b38a3fd065c3906e2e3f0863b83f2f4b740f4
2017-05-06 01:55:40 +00:00
Nathan Harold
a65e544478 Move newFromRil() function to a utility class
Remove a dependency on frameworks/opt from SmsMessage for CDMA

-Code move to frameworks/opt/telephony../cdma/SmsMessageConverter

Bug: 33414487
Test: Manually verified GSM and CDMA SMS: MO and MT
Change-Id: I730d292c4aad6524b03b18c0751738a73a71ecf7
2017-05-05 18:11:11 -07:00
Nathan Harold
18e74566e4 Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
-Move the OTASP_* constants from SST
-Update references to those constants in TelephonyRegistry

Bug: 33414487
Test: compilation
Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa
2017-05-05 18:11:10 -07:00