Hall Liu
37c72cdf05
Merge "getStreamingServices for embms" am: b73fe9a751 am: 1d274ca5ec am: a73e417752
...
am: cf4e147769
Change-Id: I5700f1d2f6b537db453e923e3e9cdcdb9fe44fec
2017-05-12 07:31:29 +00:00
nharold
8dc741fda0
Merge "Add hidden APIs to get the cached SignalStrength from SST" am: 5b8a9c873f am: cca5fbe779 am: 8d361350ff
...
am: c5c4f5a45e
Change-Id: I8f8d3c142a6a01cfe47a1c14e349b04ed97d857a
2017-05-12 07:17:10 +00:00
Chen Xu
0443aeb3f5
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0 am: 44cb5df46f
...
am: 6771979e22
Change-Id: Iafd00fc14ab5ae21d6d3b6c6177f215e9b5bed39
2017-05-12 03:54:28 +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
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
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
Hall Liu
4f8e9241a4
Merge "Merge "Increase limit of locale pairs" am: aa9a59ab32 am: 22ff1759d2 am: dba95b0c94" into oc-dev-plus-aosp
...
am: cae12de52a
Change-Id: I759e44a846f638e3c6ff1f8325e5f05a6e0a253f
2017-05-10 22:39:10 +00:00
Robert Greenwalt
44d55c6bbb
Merge "Merge "Update startStreaming to return status code" am: 6476ceeaee am: a89cacebfb am: 331058a871" into oc-dev-plus-aosp
...
am: 07f060227d
Change-Id: Ibf7f4aed57b592373ff37f1b2b40f72f3cc25d90
2017-05-10 22:05:27 +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
TreeHugger Robot
907d05aa67
Merge "Notify ImsService Status Correctly"
2017-05-10 18:16:18 +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
TreeHugger Robot
3f2cb59c43
Merge "Support different SIM power states"
2017-05-10 17:44:07 +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
bf28b01587
Merge "Changes to MbmsStreamingManager for test app" am: df57734354 am: 244912f414 am: 7249a96ce4
...
am: f5bd3d9d42
Change-Id: I6cbc2d345b6802c01fcdf0c7ae2cc6a88028371e
2017-05-10 02:28:59 +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
Brad Ebinger
13a64f078a
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
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
2017-05-09 13:31:50 -07:00
Grace Chen
75fc507ff6
Support different SIM power states
...
Test: Verify SIM power states
Bug: 35844036
Change-Id: I968269e88eec40af6e3ca71cbb805a77e016da0f
2017-05-09 11:32:40 -07: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
Nathan Harold
daae72b311
Port Utility Functions from DefaultPhoneNotifier
...
-Move static utility functions from frameworks/opt/telephony/
..DefaultPhoneNotifier to a new utility class in frameworks/base
-Update TelephonyRegistry to point to the new functions.
Bug: 33414487
Test: compilation
Change-Id: I36a113cb5122569d451ec3a2dfa71d72d590fa52
2017-05-05 18:11:10 -07:00
Nathan Harold
1bc2c54ff6
Remove dependency on IccConstants from SmsManager
...
-Redefine the length of the SmsRecord in SmsManager
Bug: 33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
2017-05-05 18:11:10 -07:00
Nathan Harold
f3e659e286
Move files from frameworks/opt/telephony to frameworks/base
...
Bug: 37688438
Test: compilation, boot on aosp_bullhead
Merged-In: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Change-Id: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
2017-05-05 18:11:02 -07:00
Hall Liu
fa2115ec47
Changes to MbmsStreamingManager for test app
...
Add binding methods to MbmsStreamingManager
Add constants for synchronous binding exceptions
Test: testapp
Change-Id: Ie798c6008029c4201ec1bb3c98c11c4a949a048a
2017-05-05 15:43:03 -07:00
Jack Yu
08556089cb
Moved channels settings from carrier config to resources
...
Since CBS channels are more countries specific instead
of carrier specific, moving it to resources makes
more sense.
Test: Manual
bug: 31223529
Change-Id: I251a55ba0b17a96ee545cad68558c1ee2c6a707c
2017-05-05 00:33:24 -07:00
Jack Yu
a0e6324b09
Merge "Consolidated all data allow/disallow logic into one method"
2017-05-05 01:55:23 +00:00