Commit Graph

4302 Commits

Author SHA1 Message Date
Ta-wei Yen
8494b6b342 Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev am: 3db7350d7d
am: 683624afd2

Change-Id: I9be453eb96cce94af91c76253c5667fe470fb9bc
2017-04-25 03:07:42 +00:00
Ta-wei Yen
683624afd2 Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
am: 3db7350d7d

Change-Id: I428d6e101d46e216a1e6e34048f1d3da2fb5314e
2017-04-25 03:00:33 +00:00
TreeHugger Robot
3db7350d7d Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev 2017-04-25 02:55:20 +00:00
Pankaj Kanwar
72d803f38e Merge "Update USSD API docs per API review comments." into oc-dev am: c2d54af521
am: 5e4296bad9

Change-Id: Ic49859ee3f3469f722354aa17920bc51cd524ae9
2017-04-24 21:58:03 +00:00
Ta-wei Yen
70a3e828aa Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony
Bug: 35766990
Change-Id: Ife9df5baa9b511cd8e9c043cb92236b7697582c1
Fixes: 35766990
Test: CtsTelephonyTestCases VisualVoicemailServiceTest
2017-04-24 13:34:12 -07:00
Pankaj Kanwar
5e4296bad9 Merge "Update USSD API docs per API review comments." into oc-dev
am: c2d54af521

Change-Id: I8f9f5d809500feb64b522cdda67d5ad5956d9b48
2017-04-24 19:30:58 +00:00
TreeHugger Robot
c2d54af521 Merge "Update USSD API docs per API review comments." into oc-dev 2017-04-24 17:34:42 +00:00
Hall Liu
6611a88da1 Merge "Second pass of eMBMS api." am: c90fcbd660 am: d61dc9e842 am: 4779240573
am: 404acdc8a1

Change-Id: I70e694f5e1adcf382f2ac93ef25aa7298ec9dd52
2017-04-22 02:20:46 +00:00
Hall Liu
404acdc8a1 Merge "Second pass of eMBMS api." am: c90fcbd660 am: d61dc9e842
am: 4779240573

Change-Id: I56a0c0dc4ddbb3d168c1a386e92158b4a1d2bdde
2017-04-22 02:12:58 +00:00
Hall Liu
d61dc9e842 Merge "Second pass of eMBMS api."
am: c90fcbd660

Change-Id: If77c71951d6514429752fa9c1ba0f8835c7e610b
2017-04-22 02:00:18 +00:00
Hall Liu
c90fcbd660 Merge "Second pass of eMBMS api." 2017-04-22 01:53:16 +00:00
Meng Wang
fca39621f3 Merge "Merge "Fix error message: getAllowedCarriers" am: 112d039dfb am: 03f4a0f034 am: 96b140489c" into oc-dev-plus-aosp
am: 1b92e2d849

Change-Id: I6df83c2fed6f9f91451c37a49244baff78c03347
2017-04-21 16:52:01 +00:00
Meng Wang
93d3f4c528 Merge "Fix error message: getAllowedCarriers" am: 112d039dfb am: 03f4a0f034
am: 96b140489c

Change-Id: Icec36f8895e4ffb081989973abf563fddbf2f2fd
2017-04-21 16:45:00 +00:00
Meng Wang
03f4a0f034 Merge "Fix error message: getAllowedCarriers"
am: 112d039dfb

Change-Id: Ic04b23b87f56261c2c55f1e0a284109bf353c8d0
2017-04-21 16:32:12 +00:00
Treehugger Robot
112d039dfb Merge "Fix error message: getAllowedCarriers" 2017-04-21 16:23:34 +00:00
Robert Greenwalt
4dded7a1b5 Second pass of eMBMS api.
Updating Streaming apis.  Adding midwear aidl files.
Updating Download apis.
Making it Compile..

Test: none yet
Change-Id: I3f44ef3f6690274af1dc2002bc02e6668fe23248
2017-04-20 12:17:37 -07:00
Jordan Liu
7d18bfa67b Merge "Use SubscriptionId instead of SubId" into oc-dev am: 8079a69eba
am: 0ed1bf8e4d

Change-Id: Idf6ba180718f4f288534fee01df9fadc3b68755d
2017-04-20 18:24:50 +00:00
Jordan Liu
0ed1bf8e4d Merge "Use SubscriptionId instead of SubId" into oc-dev
am: 8079a69eba

Change-Id: I6088d29019aa8dc872a354cbc0b63ddb87c95b00
2017-04-20 17:15:13 +00:00
Treehugger Robot
a0cef3c9c1 Merge "DO NOT MERGE. SystemUI: Display RAT icon when data is off" 2017-04-20 16:39:38 +00:00
Wenting Xiong
8daf38a719 DO NOT MERGE. SystemUI: Display RAT icon when data is off
Introduce customization and implementation to display RAT icon in status
bar even when data is off. Since some carriers require, this feature is
necessary.

Test: Test with simulated RIL
Bug: 28805511
Change-Id: I412a407b8bcfeb9b3caf265bc7e0331a88433725
2017-04-20 15:32:27 +00:00
Jordan Liu
0f332523b2 Use SubscriptionId instead of SubId
Rename the methods and arguments in ServiceStateTable to use
SubscriptionId instead of SubId.

Change-Id: I6f99da3bf533cab74f5ec81aac4f62e63d55378a
Fixes: 35766624
Test: Existing unit tests pass
2017-04-19 14:40:23 -07:00
Meng Wang
c39e089e79 Fix error message: getAllowedCarriers
Test: make
Change-Id: I0ee74f34f31742f2bf979dd9158ed22d56d64e5e
2017-04-19 11:00:50 -07:00
Chen Xu
908d9a5d80 Merge "better defualt behaviour for msim" into oc-dev am: 7358ebeedd
am: 23d5da6a5d

Change-Id: If8cdd98760d2e0e142e7374aaa5ff6de75a498b9
2017-04-19 01:02:14 +00:00
Chen Xu
23d5da6a5d Merge "better defualt behaviour for msim" into oc-dev
am: 7358ebeedd

Change-Id: Id8fd96ae871c510972f70450224b5ab2e20f27da
2017-04-19 00:55:11 +00:00
Chen Xu
7358ebeedd Merge "better defualt behaviour for msim" into oc-dev 2017-04-19 00:34:59 +00:00
Pankaj Kanwar
efbc20fe2e Update USSD API docs per API review comments.
Expand docs on failure return codes.
@hide the success return code which is only used internally.
Expand docs on the UssdResponseCallback class to make them more clear
what the format of the USSD response is, and how it might be consumed.
Fixed broken java doc.

Test: Make docs, inspect docs.
Bug: 35766890
Change-Id: I7a3c26c436c60372116c5b43cb45c513f4276b8c
2017-04-18 15:52:24 -07:00
TreeHugger Robot
0680962133 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" into oc-dev 2017-04-18 02:51:00 +00:00
Jordan Liu
f63d979045 Merge "Update api for ServiceStateProvider" into oc-dev
am: 728fbfb7c1

Change-Id: I0b61681780b9337b5b6e36b1aadc23c52199ea08
2017-04-17 20:56:45 +00:00
TreeHugger Robot
8e3b1a63f9 Merge "EUICC API changes to support error resolution." 2017-04-17 19:22:49 +00:00
Jordan Liu
b9b75edb2d Update api for ServiceStateProvider
ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.

Test: flashed onto device locally
Bug: 33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Merged-In: I62b6b8bcfdf909aa36e44441f8672f98f581f896
2017-04-17 11:07:31 -07:00
Nathan Harold
f5144f742a Update doc string for getForbiddenPlmns() to READ_PHONE_STATE
For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE

Bug: 35261110
Test: docstring only change. Compilation
Merged-In: I3647271798b33040751905c13b20da727eacfd9b
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
(cherry picked from commit 04908fcd17)
2017-04-17 17:31:32 +00:00
Jordan Liu
c0c2c99929 Merge "Update api for ServiceStateProvider" 2017-04-17 16:53:17 +00:00
Nathan Harold
f923fb5e13 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am: 02278a5a02 am: d50a325553 am: 661278432d
am: 23e6899924

Change-Id: I53c03893629be1662f3f5922011d600b19e878bf
2017-04-15 22:33:43 +00:00
Nathan Harold
23e6899924 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am: 02278a5a02 am: d50a325553
am: 661278432d

Change-Id: Ie6ed56a31df7a4b9e0730693561786562eb42fc9
2017-04-15 22:26:36 +00:00
Jordan Liu
0ad90ba2a9 Update api for ServiceStateProvider
ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.

Test: flashed onto device locally
Bug: 33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
2017-04-14 22:16:50 -07:00
Treehugger Robot
02278a5a02 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" 2017-04-15 01:43:00 +00:00
Nathan Harold
04908fcd17 Update doc string for getForbiddenPlmns() to READ_PHONE_STATE
For whatever reason when I chose the permission for this API I
chose the internal READ_PRIVILEGED_PHONE_STATE. Updating this to
use the equivalent public permission (since this is a public API)
requires me to use READ_PHONE_STATE

Bug: 35261110
Test: docstring only change. Compilation
Change-Id: I3647271798b33040751905c13b20da727eacfd9b
2017-04-14 13:13:11 -07:00
Ta-wei Yen
27a931eb69 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev am: ad989b1711
am: 63668e4396

Change-Id: I51e4f432edb54180cd11e95d5a0df32a1ede546f
2017-04-14 17:03:34 +00:00
Ta-wei Yen
63668e4396 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev
am: ad989b1711

Change-Id: I7a9f56a2585584fdce87025cd07c5c526c9bc176
2017-04-14 04:11:29 +00:00
TreeHugger Robot
ad989b1711 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev 2017-04-14 01:44:06 +00:00
fionaxu
664595f06d better defualt behaviour for msim
switch behaviour for the default case based on caller's context,
some API prefer defaultDataId while others prefer
defaultVoiceId/DefaultSmsId.

Bug: 36818721
Change-Id: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
2017-04-13 17:10:17 -07:00
Shuo Qian
cfe9e61ce4 ECBM SystemProperty cleanup
- Add getEmergencyCallbackMode() method in the TelephonyManager.java
to get the boolean value for ECBM callback mode from the phone through
ITelephony.aidl/java interface

- Use the added TelephonyManager Api to replace the 'get' of
PROPERTY_INECM_MODE system property in the framework/base

Change-Id: I83fbdeef5c0b43a8fc16ece044c9e191e9922bce
Test: manual
Bug: 30361624
2017-04-12 22:36:00 +00:00
Shuo Qian
c77146ceb1 Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f am: 36611a0958
am: 56d3af6680

Change-Id: Ida75e1835bc99a328baeee71b6838581800916b0
2017-04-12 22:11:17 +00:00
Amit Mahajan
682ce66309 Merge "Add p2 option in openLogicalChannel." into oc-dev 2017-04-12 22:02:39 +00:00
Shuo Qian
56d3af6680 Merge "ECBM SystemProperty cleanup" am: 4718606368 am: 40cde7b71f
am: 36611a0958

Change-Id: Ib68a4e3b34ad4d76e4b254350b523eaa424b30f9
2017-04-12 21:11:58 +00:00
Shuo Qian
4718606368 Merge "ECBM SystemProperty cleanup" 2017-04-12 20:52:20 +00:00
Ajay Nambi
ebe860e5cc Add p2 option in openLogicalChannel.
- Add support for iccOpenLogicalChannelWithP2.
- Needed to support OMAPI 3.0 defined
by SIM Alliance.
- Deprecate iccOpenLogicalChannel(String) API and
pass down an invalid p2 value to keep original behavior

Test: Basic telephony sanity
Bug: 27360148
Change-Id: I2ab6cfb7a54c451f32936df51b8298f35a6dc67f
2017-04-11 17:39:42 -07:00
Brad Ebinger
f5001109c5 Merge "Move @SystemApi access to ImsService" into oc-dev am: 509a311976
am: 442d7645a2

Change-Id: I215d2ba6dd947a3979aa17b6695a77cb7b50288f
2017-04-11 23:29:11 +00:00
Brad Ebinger
442d7645a2 Merge "Move @SystemApi access to ImsService" into oc-dev
am: 509a311976

Change-Id: I98a548a4a7f2df635d8132a93948ece3fb70be0a
2017-04-11 23:20:16 +00:00
Brad Ebinger
509a311976 Merge "Move @SystemApi access to ImsService" into oc-dev 2017-04-11 23:12:11 +00:00