4271 Commits

Author SHA1 Message Date
Brad Ebinger
46681288bc Merge "reates base implementation of ImsService AIDLs" am: b60869db12 am: fe8d588dad
am: fe2a74bfee

Change-Id: I9b7885ead16666b57e3b77b2bb868f81fb68de3b
2017-02-23 20:19:50 +00:00
Brad Ebinger
fe8d588dad Merge "reates base implementation of ImsService AIDLs"
am: b60869db12

Change-Id: I6edf280213bee0756aad65148daafe3300849baa
2017-02-23 20:10:34 +00:00
Treehugger Robot
b60869db12 Merge "reates base implementation of ImsService AIDLs" 2017-02-23 20:03:43 +00:00
Chen Xu
44fa5c3346 Merge "renaming telephony internal hidden intents" am: 09c663a84c am: 979e4690ec
am: 201320492c

Change-Id: I4e37359a98fb8ecdff63b45a54f08b61e7be25ad
2017-02-23 04:15:28 +00:00
Abhishek Adappa
2134e14bda Add a new ImsReasonInfo code
For IKEv2 authentication failure during ePDG tunnel establishment.

Test: make
Change-Id: I1d10efac806abfaa80d9875b908385f7732f293a
2017-02-22 19:16:58 -08:00
Chen Xu
979e4690ec Merge "renaming telephony internal hidden intents"
am: 09c663a84c

Change-Id: Ic20ae9e6816d629c979859a7d18f1827bafcc034
2017-02-23 02:03:00 +00:00
Chen Xu
09c663a84c Merge "renaming telephony internal hidden intents" 2017-02-23 01:55:25 +00:00
Brad Ebinger
21013dcf1b reates base implementation of ImsService AIDLs
This change introduces "base classes" of the AIDL interfaces that are
implemented in vendor provided ImsServices. This allows for new APIs
to be added to the AIDL files, along with stub implementation of those
AIDLs in the base classes. By extending from the base class, older
implementations of the AIDL interfaces will not need to be updated
when the interface changes.

This change also moves some of the com.android.ims classes from
frameworks/opt/net/ims to frameworks/base. Any class that will be
used in the new unbundled ImsService system will need to be in
the framework, as opposed to the optional library that they are
in now.

Bug: 30290416
Test: Manual
Change-Id: I4a186d8e910d6d4f711e983ec8d717fc5cbdefab
2017-02-22 16:58:50 -08:00
Brad Ebinger
4fb8988854 resolve merge conflicts of ac9b2c4fab42 to stage-aosp-master
Change-Id: I4a6094c41ab267f89a15c5e8caa25e6b683419d0
2017-02-22 16:04:39 -08:00
TreeHugger Robot
fc5cbc90cf Merge "TelephonyManager#setAllowedCarriers: comment update" 2017-02-22 23:58:24 +00:00
Brad Ebinger
ac9b2c4fab Merge "Add UI prompt for MMI code failure on 3gpp" 2017-02-22 23:22:07 +00:00
TreeHugger Robot
24dfce2fbe Merge "Mark some system intents as SystemApi" 2017-02-22 03:07:46 +00:00
Jack Yu
d1f5b4245f Merge "Added telephony manager set sim power state API"
am: cbffe38631

Change-Id: I9fbe161505905c3d3c1c431d1589248324fb3e4f
2017-02-22 02:50:29 +00:00
Treehugger Robot
cbffe38631 Merge "Added telephony manager set sim power state API" 2017-02-22 02:45:18 +00:00
Jack Yu
e25a4dfb6a Added telephony manager set sim power state API
The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.

Test: Telephony sanity tests
bug: 32224755

Change-Id: Ib82ab1eff613946e7c31c9b2131183a40d09af80
2017-02-21 17:36:45 -08:00
Amith Yamasani
cbabb8dddc Mark some system intents as SystemApi
These intents are handled by some system apps and use the
android.* namespace. So mark them as SystemApi for CTS verification
purposes.

Fixes some of the CTS signature tests.

Change-Id: I18664b3e92bb24a5cf96d89cf47d6abb88b13220
Fixes: 35253923
Test: cts-tradefed run cts-dev -m CtsSignatureTestCases
2017-02-22 01:27:38 +00:00
Jack Yu
90065e6e8c Merge "Added telephony manager set sim power state API" 2017-02-21 23:58:30 +00:00
Brad Ebinger
caa5a35371 Merge "Remove Session ID from ImsService APIs that do not need it." am: 975be6c065 am: 50bc658e20
am: 8e8c26e25a

Change-Id: I7c7e02c23da5ef12bb0645be39eada1d11b8725c
2017-02-21 20:32:16 +00:00
Brad Ebinger
50bc658e20 Merge "Remove Session ID from ImsService APIs that do not need it."
am: 975be6c065

Change-Id: I09469d99bc68133a4de594507854c269e905c40e
2017-02-21 20:24:21 +00:00
Jack Yu
6078cfebb0 Added telephony manager set sim power state API
The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.

Test: Telephony sanity tests
bug: 32224755

Change-Id: Ib82ab1eff613946e7c31c9b2131183a40d09af80
2017-02-21 11:52:03 -08:00
Brad Ebinger
e63b35d0b2 Remove Session ID from ImsService APIs that do not need it.
Traditionally, to initiate a new call with the ImsService APIs,
you have to "open()" the interface, which returns a session ID.
This is not needed for querying other information, such as the
provisioning status of the ImsService slot.

Test: Manual
Change-Id: I155b291a49b9aa5ed9599f5a78b1e8d7ff9f8e1c
2017-02-17 14:50:48 -08:00
Meng Wang
ac495240b1 TelephonyManager#setAllowedCarriers: comment update
Will return -1 on null input

Bug: 35374455
Test: make
Change-Id: I6c4943298383e765ad7da17d3ff167b384360ba6
2017-02-17 12:58:42 -08:00
Brad Ebinger
c9c8b590c5 Merge "Adds @hide ImsService APIs" am: 2b879016d3
am: f46aa6f9ee

Change-Id: I12e10d796a7b2d56cacf8e9b53bb5e228b79ecc3
2017-02-17 20:29:13 +00:00
Treehugger Robot
2b879016d3 Merge "Adds @hide ImsService APIs" 2017-02-17 19:21:45 +00:00
TreeHugger Robot
1ad4f0e60b Merge "Adds @hide ImsService APIs" 2017-02-17 02:09:48 +00:00
Jack Yu
3edeec530f Merge "Added the new RIL request to set SIM power state" am: 2f21f71da4 am: bf21df3306
am: 8c89daceaf

Change-Id: I7dd15375a56a9243bf0c24c87def9949596093e0
2017-02-17 01:40:51 +00:00
Jack Yu
8c89daceaf Merge "Added the new RIL request to set SIM power state" am: 2f21f71da4
am: bf21df3306

Change-Id: I7d11f132ca483272963f12363496d70651076f0b
2017-02-17 01:31:49 +00:00
TreeHugger Robot
bb67b4474f Merge "Added the new RIL request to set SIM power state" 2017-02-16 22:38:45 +00:00
Meng Wang
d5486f92d0 Merge "Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL" into nyc-mr2-dev am: cd923a6910
am: 6b2a20cdc3

Change-Id: Idbc42f28de59cd90bdf501a984a988c79ea36849
2017-02-16 22:27:56 +00:00
Meng Wang
6b2a20cdc3 Merge "Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL" into nyc-mr2-dev
am: cd923a6910

Change-Id: I7c0432d62803b299de1777dd27c83fdca440d306
2017-02-16 22:22:39 +00:00
Brad Ebinger
1639c21be6 Adds @hide ImsService APIs
Adds @hide ImsService API implementations to be used for the new
dynamic ImsResolver.

1) ImsService - The main class that all vendor ImsServices will implement.
ImsServices that implement this method must return their implementations
of MMTelFeature when onCreateMMTelFeature is called. The base ImsService
class also relays all method calls through itself as a proxy. So, when
Telephony calls a method, the ImsService figures out which MMTelFeature
should be called (by slot) and then calls that feature's method
implementation.

2) MMTelFeature/RcsFeature - Implements the I*Feature interfaces, which
are used on both sides of the interface. The vendor implemented ImsService
must implement all methods provided in the I*Feature interface in their
implementation of *Feature that they return to the ImsService.

3) ImsServiceProxy[Compat] - The Proxy interface in telephony that will be
called in ImsManager. When a method in this class is called, it will call
the respective AIDL function: Telephony -> IImsServiceController AIDL ->
vendor ImsService -> vendor ImsFeature implementation.
ImsServiceProxyCompat is there to provide backwards compatibility with
older ImsServices that do not use the new ImsService implementations.
It implements all of the methods that are defined in the new I*Feature
interfaces and translates them to the old ImsService AIDL calls.

Test: Adds Unit Tests (see frameworks/opt/telephony)
Merged-In: Id3466c178384158c788ab1d708ab108bb95866fc
Change-Id: Id3466c178384158c788ab1d708ab108bb95866fc
2017-02-16 11:14:26 -08:00
Brad Ebinger
15708a316b Adds @hide ImsService APIs
Adds @hide ImsService API implementations to be used for the new
dynamic ImsResolver.

1) ImsService - The main class that all vendor ImsServices will implement.
ImsServices that implement this method must return their implementations
of MMTelFeature when onCreateMMTelFeature is called. The base ImsService
class also relays all method calls through itself as a proxy. So, when
Telephony calls a method, the ImsService figures out which MMTelFeature
should be called (by slot) and then calls that feature's method
implementation.

2) MMTelFeature/RcsFeature - Implements the I*Feature interfaces, which
are used on both sides of the interface. The vendor implemented ImsService
must implement all methods provided in the I*Feature interface in their
implementation of *Feature that they return to the ImsService.

3) ImsServiceProxy[Compat] - The Proxy interface in telephony that will be
called in ImsManager. When a method in this class is called, it will call
the respective AIDL function: Telephony -> IImsServiceController AIDL ->
vendor ImsService -> vendor ImsFeature implementation.
ImsServiceProxyCompat is there to provide backwards compatibility with
older ImsServices that do not use the new ImsService implementations.
It implements all of the methods that are defined in the new I*Feature
interfaces and translates them to the old ImsService AIDL calls.

Test: Adds Unit Tests (see frameworks/opt/telephony)
Change-Id: Id3466c178384158c788ab1d708ab108bb95866fc
2017-02-16 11:03:31 -08:00
Jack Yu
866e9e3947 Added the new RIL request to set SIM power state
The new RIL request for powering up/down the SIM card.

Test: Telephony sanity tests
bug: 32224755
Merged-In: Ia20f824eb9a0bf6d5f63f782a8d42a22a0355938
Change-Id: Ia20f824eb9a0bf6d5f63f782a8d42a22a0355938
2017-02-16 05:11:41 +00:00
Jack Yu
233cb9efdf Added the new RIL request to set SIM power state
The new RIL request for powering up/down the SIM card.

Test: Telephony sanity tests
bug: 32224755
Change-Id: Ia20f824eb9a0bf6d5f63f782a8d42a22a0355938
2017-02-15 20:56:17 -08:00
Meng Wang
0506299343 Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL
Bug: 28709116
Change-Id: I19673ef092ebbd655e3d687fc8d92bd9f67c5645
2017-02-15 16:22:15 -08:00
fionaxu
b80c879c91 renaming telephony internal hidden intents
The "android.*" namespace for intent constants is reserved for public
Android API in AOSP. (Whether public to the full SDK, @SystemApi or
defined in AOSP support libraries.) Implementation details of AOSP
components (subject to change by OEMs at will) should use the
"com.android.internal.*" as per CDD

Bug: 33679454
Test: manual
Change-Id: I72ed2760a6ddb0bba61cc8041cea57d5f28b7c15
2017-02-15 15:42:23 -08:00
Ta-wei Yen
2d7212d822 Add setVoicemailRingtoneUri() and setVoicemailVibrationEnabled()
This CL allows the default dialer to modify the voicemail ringtone.
All settings except the voicemail provider and voicemail nubmer can
be moved to the dialer after this CL.

Bug: 34626472
Fixes: 34626472
Test: CtsTelephonyTestCases TelephonyManagerTest
    testVoicemailRingtoneSettings and testVoicemailVibrationSettings

Change-Id: I5dd1e5ac8c358b09ff9a98051c429dba758c04a4
2017-02-15 09:21:53 -08:00
Chen Xu
b4f9ceb912 Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382
am: 60ca278b7f

Change-Id: I13a38eb6094899e396d079e13e07e15d1cb5ca98
2017-02-14 01:46:33 +00:00
Chen Xu
60ca278b7f Merge "Add simActivationState to PhoneStateListener" am: 132842efc9
am: b206f5b382

Change-Id: I3feca80a72ee4a7ef3fe1583aa563451b91a68f4
2017-02-14 01:42:00 +00:00
Chen Xu
132842efc9 Merge "Add simActivationState to PhoneStateListener" 2017-02-14 01:26:19 +00:00
fionaxu
64eebba6bc Add simActivationState to PhoneStateListener
- new public SimActivationState
- hook with PhoneStateListener, notifying registrants when voice&data
  activation state changed

Bug: 31061369
Test: existing TC runtest --path frameworks/opt/telephony/tests/telephonytests
Test: new TC runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java

Merged-in: CHANGE-ID Ieefe2698fe6055a980d225f5ce74f52aef0daab4
Change-Id: Iac6418f66c9dad44dc7272ab19aa87f3eef232f8
2017-02-13 00:26:35 -08:00
Tyler Gunn
3b8f62b602 Format Japanese numbers using national format when in Japan.
Similar to the like change for Korean phone numbers, ensure that when the
user is in Japan, Japanese phone numbers are formatted using the national
format rather than the international format.

Test: Unit
Bug: 27090466
Change-Id: I3487eea9fddbe7ee15c03da3f03d53f9dcea0834
2017-02-12 21:26:13 -08:00
fionaxu
12312f6d75 Add simActivationState to PhoneStateListener
- new public SimActivationState
- hook with PhoneStateListener, notifying registrants when voice&data
  activation state changed

Bug: 31061369
Test: existing TC runtest --path frameworks/opt/telephony/tests/telephonytests
Test: new TC runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java

Change-Id: Ieefe2698fe6055a980d225f5ce74f52aef0daab4
2017-02-10 15:15:01 -08:00
Sooraj Sasindran
8fbf6a29d0 Merge "Expose api to retrieve wakelock information per client" 2017-02-10 05:38:41 +00:00
Sooraj Sasindran
4c8fc962dc Merge "Expose api to retrieve wakelock information per client" into nyc-mr1-dev-plus-aosp
am: cbbf530125

Change-Id: Id5ea5536246343a530f7579a31039421b3859de3
2017-02-10 03:03:38 +00:00
Sooraj Sasindran
0fc0a7edf7 Expose api to retrieve wakelock information per client
Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

BUG=31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
2017-02-09 16:44:02 -08:00
Brad Ebinger
ade9937437 Add UI prompt for MMI code failure on 3gpp
Some carriers do not support call forwarding MMI codes while roaming
on 3gpp networks. A new message has been added that clarifies this
to the user.

Test: Manual
Bug: 30106345
Merged-In: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
Change-Id: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
2017-02-09 15:00:49 -08:00
Sooraj Sasindran
335c89c22e Expose api to retrieve wakelock information per client
Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

BUG=31041780
Merged-In: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
Change-Id: Ie39fe59055eb7931bd179dd9e2537a7552c38af8
2017-02-09 21:51:04 +00:00
Tyler Gunn
58d8c5eb07 Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e
am: 998655f80e

Change-Id: I01c5d8c15ce9377f126fc7268bd1a8ecee602dc8
2017-02-08 22:05:45 +00:00
Tyler Gunn
998655f80e Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8
am: e55b11573e

Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
2017-02-08 22:01:07 +00:00