4271 Commits

Author SHA1 Message Date
Hall Liu
814fdf9312 Merge "IMS: RTT interface changes" 2017-04-04 21:21:17 +00:00
Sanket Padawe
5cca5338d5 Merge "Merge commit 'b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed" into oc-dev-plus-aosp
am: 1681765669

Change-Id: I627e6c413eb09ae9ded4ae1322161dbf7be4241e
2017-04-04 18:05:18 +00:00
Sanket Padawe
edf3bae41e Merge commit 'b73a3bd336edc8fa22ba61fb24a17036cbefce76' into manual_merge_b73a3bd336ed
Change-Id: I5c5daf994092fba7ef6ff4a2987344f0503d9dfe
2017-04-04 10:53:19 -07:00
Ta-wei Yen
d6099178f1 Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled
The visual voicemail client is removed from telephony service. There
are no longer code to handle these methods. These methods are only
used by dialer during NMR1.

Bug: 36173451
Fixes: 36173451

Test: smoke test dialer visual voicemail operations.
Change-Id: I82a35026821b4c4d98420e5bfcecff78b2163822
2017-04-04 10:24:25 -07:00
Sanket Padawe
c29fff5032 Merge "Make some intents public in SubscriptionManager."
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff
2017-04-04 16:59:13 +00:00
Treehugger Robot
35e9a94dee Merge "Make some intents public in SubscriptionManager." 2017-04-04 16:48:33 +00:00
Sanket Padawe
e4f5f79c65 Make some intents public in SubscriptionManager.
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
Merged-in: Ibb1d1faae9a002ccb530446e24897955c12076e1
2017-04-03 15:53:05 -07:00
Pankaj Kanwar
a3c05485db Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev
am: 37bbb789af

Change-Id: I5181ea040e2406c9b7bc2bb8c16f2b1a8d35946e
2017-04-03 22:41:17 +00:00
Pankaj Kanwar
37bbb789af Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev 2017-04-03 22:36:03 +00:00
yinxu
2c7ea1bbe5 Add a carrier option to hide the option of "Enhanced 4G LTE Mode"
The option "Enhanced 4G LTE Mode" currently may be hidden according to
the VoLTE state of the plateform and device. With this new option we can
choose to hide the "Enhanced 4G LTE Mode" irrespective of VoLTE state.

Bug: 36220377
Test: manual
Change-Id: I516ad050e623a368f2c2ef3d81650eb20c20fd5b
(cherry picked from commit 0bf350c9c9199b78c611cfca62ffef3ad1ea0564)
2017-04-03 15:25:43 -07:00
Sanket Padawe
cfbec2293f Merge "Make some intents public in SubscriptionManager." into oc-dev am: 9077faab1f
am: a374081697

Change-Id: I68cac494b2cae5217657098672a49ce99a6feca4
2017-04-03 22:23:28 +00:00
Sanket Padawe
a374081697 Merge "Make some intents public in SubscriptionManager." into oc-dev
am: 9077faab1f

Change-Id: I5cfb95fd6965c58adfb86e4a607123b648d10b24
2017-04-03 22:16:54 +00:00
Sanket Padawe
9077faab1f Merge "Make some intents public in SubscriptionManager." into oc-dev 2017-04-03 22:10:29 +00:00
Jeff Davidson
9bcef123f4 Merge "Squashed merge of master-sim into master." 2017-04-03 20:26:59 +00:00
pkanwar
95941f7c97 Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
(cherry picked from commit 89731a8389c9726172989f1677b76cc0f6a96f4f)
2017-04-03 19:39:42 +00:00
Chad Brubaker
d6ce1adabf Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am: e35d50622c
am: a8c068f723

Change-Id: Id57b91b68ce6a4e1f31e8670798b59b82593ea96
2017-04-03 18:25:36 +00:00
Jeff Davidson
35cda39422 Squashed merge of master-sim into master.
Includes the following commits:

==

New system feature: eUICC.

Presence of this feature implies that eUICC-related APIs are expected
to function as long as an eUICC is present in the device. Note that an
eUICC may be embedded in the device but may also be removable.

==

Add empty EuiccManager API and plumbing.

==

Add stub EuiccService.

EuiccService is the class that the LPA app must implement; for now,
just define the action and priority so that the implementation can be
found. Actual methods will come later.

Also declare two relevant permissions: BIND_EUICC_SERVICE, which the
implementation must require (so that nobody else can bind to the
service directly), and WRITE_EMBEDDED_SUBSCRIPTIONS, which permits
signature|privileged apps and CTS (via development) to access
EuiccManager APIs.

==

Add UiccAccessRule based off UiccCarrierPrivilegeRules#AccessRule.

This class can be used to transfer access rules between an
EuiccService implementation and the platform.

We also add a simple encoding/decoding of a list of rules so that they
may be stored in the subscription info table.

==

Add getEid() to EuiccManager/EuiccService.

getEid() fetches the EID. It requires either a privileged permission
(READ_PRIVILEGED_PHONE_STATE) or carrier privileges on the
currently-active profile. Until there is a use case that requires
opening this up to apps with only READ_PHONE_STATE, we shouldn't do
so.

To avoid churn in the future, the API signatures for EuiccService
include a slot ID to identify which SIM slot is being used. However,
this parameter is currently not populated correctly (nor is it usable,
as no Telephony APIs accept a slot ID to address commands). There is
no need to expose it yet in the EuiccManager APIs as we expect to
follow the TelephonyManager pattern of allowing per-slot instances of
EuiccManager in the future while keeping other method signatures the
same.

==

Define Euicc UI actions in EuiccManager/EuiccService.

The EuiccManager actions are to be implemented by the platform (and
only the platform), which forwards the actions to the active
implementation.

Also, remove our explicit priority meta-data tag as we can just rely
on android:priority in the corresponding intent-filter.

==

APIs for downloading embedded subscriptions.

Includes:

-getDownloadableSubscriptionMetadata, used by the platform and LUI to
fetch metadata about a downloadable subscription. The platform will
use this to perform the necessary permission checks (only allowing
otherwise-unprivileged apps to download profiles that are permitted
per the subscription metadata), and the LUI can use this to present
the name of the profile.

-downloadSubscription, to actually perform a profile download.

The stub for startResolutionActivity is included but not implemented;
resolution activities will be handled in a follow-up change.

==

Test: TreeHugger
Change-Id: I47b1da5a69f0736012cb137e02cd6c4e07fdaace
2017-04-03 11:17:53 -07:00
Chad Brubaker
a8c068f723 Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am: e35d50622c

Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d
2017-04-03 18:13:27 +00:00
Sanket Padawe
2c1a49f933 Make some intents public in SubscriptionManager.
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
2017-04-03 10:13:12 -07:00
Pankaj Kanwar
1ce83f009e Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." 2017-04-03 01:31:40 +00:00
pkanwar
89731a8389 Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
2017-03-31 12:16:56 -07:00
Junda Liu
8531328fc8 Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key.
Value includes which apps need to be enabled for current carrier.

Bug: b/35924008
Test: make and manual

Change-Id: Icb089d4641610b0618a8717fa3fed8d3770d5f52
2017-03-31 11:24:46 -07:00
Chad Brubaker
0c1651f289 Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS
Bug: 35853790
Test: make -j128 checkbuild
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Change-Id: I11d374cbbb6c2deaf74ac784ff995bd182fe9157
2017-03-31 11:20:02 -07:00
Tyler Gunn
1b2bb38297 Merge "Add carrier config to hide merge button for IMS conference" am: 78b3cbe4e0 am: ec22b62a3a
am: 611d2fb148

Change-Id: Ie4a0b463905ac05527dc54ad8a47c3058994b212
2017-03-31 15:26:39 +00:00
Tyler Gunn
ec22b62a3a Merge "Add carrier config to hide merge button for IMS conference"
am: 78b3cbe4e0

Change-Id: I8dbfda0871dd06cf446fa42debba955e18b4bf0f
2017-03-31 15:12:37 +00:00
Tyler Gunn
78b3cbe4e0 Merge "Add carrier config to hide merge button for IMS conference" 2017-03-31 15:05:37 +00:00
Sanket Padawe
fa9e00bde5 Merge "Disable voice call barring notification for Verizon."
am: e0f0f6ca4b

Change-Id: Ia30a4e2dd76b5fcaced93ccbe16720c4ef808d2c
2017-03-31 00:23:28 +00:00
fionaxu
cf828f2e11 remove deprecated API sendDialerCode
Bug: 35767402
Test: run cts -m CtsPermissionTestCases -t
android.permission.cts.TelephonyManagerPermissionTest

Change-Id: I738cb5680e598ff84ad09f9c2d1cb18b01ad7d06
2017-03-31 00:18:03 +00:00
Sanket Padawe
e0f0f6ca4b Merge "Disable voice call barring notification for Verizon." 2017-03-31 00:01:31 +00:00
Sanket Padawe
25e4f1cb37 Disable voice call barring notification for Verizon.
Test: Manual
Bug: 31490566
Change-Id: I2cb9f9b08f54faa276ddef9df36725aa76337746
Merged-in: I2cb9f9b08f54faa276ddef9df36725aa76337746
2017-03-30 22:12:36 +00:00
Sanket Padawe
692ed97d87 Merge "Disable voice call barring notification for Verizon." into oc-dev
am: d1d3cdcd4f

Change-Id: I416b9ecd1176db89d6abf11e952b037e57d3429d
2017-03-30 20:57:51 +00:00
Sanket Padawe
d1d3cdcd4f Merge "Disable voice call barring notification for Verizon." into oc-dev 2017-03-30 20:52:22 +00:00
Sanket Padawe
db688bbad7 Disable voice call barring notification for Verizon.
Test: Manual
Bug: 31490566
Change-Id: I2cb9f9b08f54faa276ddef9df36725aa76337746
2017-03-30 11:23:49 -07:00
Abhijith Shastry
c8d771593a Merge "Update injectSmsPdu documentation." into oc-dev
am: 13dbbaf50a

Change-Id: I6174713b7b9a2b51bca56ffe680a00d0591a35dd
2017-03-30 00:40:30 +00:00
TreeHugger Robot
13dbbaf50a Merge "Update injectSmsPdu documentation." into oc-dev 2017-03-30 00:36:01 +00:00
Robert Greenwalt
23c5a5e966 Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
The name is not allowed for an internal, non-public
intent.  Changed to use com.android.internal.* namespace.

bug:35266833
Test: Ran cts.IntentTest.shouldNotFindUnexpectedIntents
Change-Id: Ifd7d7f0aa537bfbbc7d67aa3b73b0887acd6104a
2017-03-29 11:30:12 -07:00
Abhijith Shastry
bc1a6e60c8 Update injectSmsPdu documentation.
BUG: 35325136
Test: Comment only update.
Change-Id: I4ff38665a06de5e989e15e17aaac5f512da4303e
2017-03-29 10:54:53 -07:00
Brad Ebinger
ae8a95883b Merge "Remove non-localized message" am: ddbd256954 am: 70a09c00e5
am: 9c7b7f0de7

Change-Id: Ifc9f2278c7497f357b7db82ed27e6083351bf84b
2017-03-28 22:44:30 +00:00
Brad Ebinger
70a09c00e5 Merge "Remove non-localized message"
am: ddbd256954

Change-Id: Ia0fb7f8facca6d15485bf98f2a0538338a878962
2017-03-28 22:35:36 +00:00
Brad Ebinger
ddbd256954 Merge "Remove non-localized message" 2017-03-28 22:21:54 +00:00
Ying Xu
ffce08e192 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" am: 23393da165 am: b2558c4ec1
am: 93d5948e51

Change-Id: I3028d999e93475bf729a357af40a78e8c94a1d51
2017-03-28 17:15:13 +00:00
Ying Xu
b2558c4ec1 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode""
am: 23393da165

Change-Id: Iaeae098f1185b045483334ff100e47a9be608c64
2017-03-28 17:04:04 +00:00
Ying Xu
23393da165 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" 2017-03-28 16:55:10 +00:00
Robert Greenwalt
f8966a0a50 Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" am: 07be9a0ef9 am: 79bde60db2
am: 8072754768

Change-Id: Iff682d4d9dc83544c0fce49c98d4c10563bf6317
2017-03-28 16:45:00 +00:00
Robert Greenwalt
79bde60db2 Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS"
am: 07be9a0ef9

Change-Id: I3158ce88ca76a3ad4e8894f514030b31ae40f1fb
2017-03-28 16:20:57 +00:00
Wei Huang
a8ad152269 Add carrier config to hide merge button for IMS conference
There is the case that operator's network does not support IMS
conference call although it supports IMS normal call. It sometimes
happens when operator starts up IMS service. In such case, it is
necessary to hide merge button for IMS conference.

Bug: 29430010
Change-Id: Iab8afaab297cd401ddea8ef4bbd6a06edfbcfeb3
2017-03-28 08:31:21 +09:00
Robert Greenwalt
7811b34b36 Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
The name is not allowed for an internal, non-public
intent.  Changed to use com.android.internal.* namespace.

bug:35266833
Test: Ran cts.IntentTest.shouldNotFindUnexpectedIntents
Change-Id: Ifd7d7f0aa537bfbbc7d67aa3b73b0887acd6104a
2017-03-27 22:43:15 +00:00
yinxu
34016ae405 Add a carrier option to hide the option of "Enhanced 4G LTE Mode"
The option "Enhanced 4G LTE Mode" currently may be hidden according to
the VoLTE state of the plateform and device. With this new option we can
choose to hide the "Enhanced 4G LTE Mode" irrespective of VoLTE state.

Bug: 36220377
Test: manual
Change-Id: I516ad050e623a368f2c2ef3d81650eb20c20fd5b
2017-03-24 10:31:28 -07:00
Jack Yu
9b7d3a86bd Merge "Deprecated getDeviceId and added getMeid and getImei"
am: ad2e7405ad

Change-Id: I4e006290c54a371fc5f080c37f86ca946507d871
2017-03-24 17:10:54 +00:00
Shuto Nagamatsu
e74c8103a4 Remove non-localized message
Remove non-localized english "code" from ImsException constructor.
Non-localized message causes user confusion.

Bug: 32792378
Change-Id: I0c71c35e7830db7de5b1d041211de54c92285b4d
2017-03-24 08:03:49 +09:00