Commit Graph

1730 Commits

Author SHA1 Message Date
nharold
d03ccf89bf Merge changes from topic 'query-fplmn-sync' am: 0dc62c6dd3 am: 1f7f262920
am: 3243ec0614

Change-Id: I3da03980792e5fa898b7109dbb2cea7147f7ee94
2017-03-01 23:38:30 +00:00
nharold
1f7f262920 Merge changes from topic 'query-fplmn-sync'
am: 0dc62c6dd3

Change-Id: Ibc08427e8de920f7f95a6a530b45cfcf8402d203
2017-03-01 21:37:58 +00:00
nharold
0dc62c6dd3 Merge changes from topic 'query-fplmn-sync'
* changes:
  Provide a public API for TelephonyManager.getForbiddenPlmns()
  Add support for querying Forbidden PLMNs
2017-03-01 20:25:17 +00:00
Tyler Gunn
b455f0deed resolve merge conflicts of 81a28efd1b to stage-aosp-master
Change-Id: Ic4c1ca055db8e70db49d9fc91dfc705da6136a5d
2017-03-01 08:44:32 -08:00
Tyler Gunn
81a28efd1b Merge "Support confirmation of international calls while on WFC only." 2017-03-01 16:08:40 +00:00
Brad Ebinger
5463895805 Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY" am: b987777f20 am: 59282ad8df
am: 81f7d06a5e

Change-Id: I006cb9e34093cfccbfb036c82c95adc91d8cc28e
2017-02-28 23:00:28 +00:00
Brad Ebinger
59282ad8df Merge "Send the IMS_SERVICE_UP intent when it is STATE_READY"
am: b987777f20

Change-Id: I6c33449b917b6d0c2a3396eea40065c2b0bc6862
2017-02-28 22:50:38 +00:00
Tyler Gunn
ef5a401b7e Support confirmation of international calls while on WFC only.
Add new carrier config which enables a confirmation message when the user
dials an international number while on WFC only.

Add new @hide PhoneNumberUtils method which is used to determine if a
number dialed is an international number.

Test: Manual, unit.
Bug: 33272455
Merged-In: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
Change-Id: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
2017-02-28 13:08:22 -08:00
Brad Ebinger
e0a7345c6a Send the IMS_SERVICE_UP intent when it is STATE_READY
The ImsService must send the IMS_SERVICE_UP intent when it
signals that it is in the STATE_READY state and
IMS_SERVICE_DOWN when it is STATE_INITIALIZING or
STATE_NOT_AVAILABLE.

Also, add READ_PRIVILEGED_PHONE_STATE check

Bug: 35736451
Test: Unit tests added in frameworks/opt/telephony
Change-Id: I03d4398cf7008cf8c51b78d99eb029aa99c63f62
2017-02-28 10:56:14 -08:00
TreeHugger Robot
b70ef8d79b Merge "Support confirmation of international calls while on WFC only." 2017-02-28 18:37:35 +00:00
Tyler Gunn
662ae090a2 Support confirmation of international calls while on WFC only.
Add new carrier config which enables a confirmation message when the user
dials an international number while on WFC only.

Add new @hide PhoneNumberUtils method which is used to determine if a
number dialed is an international number.

Test: Manual, unit.
Bug: 33272455
Change-Id: Ia7ffe10eee7d782ddc3355db616af0a48f19556e
2017-02-28 08:37:42 -08:00
Nathan Harold
6a7c9333b9 Provide a public API for TelephonyManager.getForbiddenPlmns()
Bug: 33296073
Test: none
Change-Id: I4f1bce663669c18098755c386456e6e9687a3cfb
2017-02-27 16:34:40 -08:00
Nathan Harold
f56cd70734 Add support for querying Forbidden PLMNs
Bug: 32277497
Test: Verified via public API for: missing SIM and working SIM
Change-Id: Ib7838a4be81853ef336e4f3d527c483b49cd2167
2017-02-27 16:01:57 -08:00
Brad Ebinger
eb422ead0c Merge "Adds read/modify permission checks to ImsService" am: 3e64003641 am: 175213e1ee
am: 055adc457a

Change-Id: I41289905222c0bc83fe1d6b075427b79afe9b0db
2017-02-27 21:34:30 +00:00
Brad Ebinger
175213e1ee Merge "Adds read/modify permission checks to ImsService"
am: 3e64003641

Change-Id: Ia4cb2c789a13658de86c0a36648a09e7abceb621
2017-02-27 21:26:50 +00:00
Brad Ebinger
3e64003641 Merge "Adds read/modify permission checks to ImsService" 2017-02-27 21:19:18 +00:00
Tyler Gunn
6680508946 Merge "Format Japanese numbers using national format when in Japan." am: 050e5ddb4f am: 8ac499fbe6
am: a84292c9d7

Change-Id: I770af0bba538268797295f59c8675191a6ef41a6
2017-02-27 03:05:28 +00:00
Tyler Gunn
8ac499fbe6 Merge "Format Japanese numbers using national format when in Japan."
am: 050e5ddb4f

Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b
2017-02-27 02:54:49 +00:00
Tyler Gunn
050e5ddb4f Merge "Format Japanese numbers using national format when in Japan." 2017-02-27 02:48:11 +00:00
Amit Mahajan
0d105deef8 Merge "Mark oemhook related APIs @Deprecated." am: 79faa72eee am: 4b026b656d
am: 2225e56bd3

Change-Id: I3225ab882809159ae1deb97efc0469d8b2777cbe
2017-02-24 20:58:39 +00:00
Amit Mahajan
4b026b656d Merge "Mark oemhook related APIs @Deprecated."
am: 79faa72eee

Change-Id: Ia31c163fdd65f305095ca1749cbc457eea4b0ca8
2017-02-24 20:48:10 +00:00
Treehugger Robot
79faa72eee Merge "Mark oemhook related APIs @Deprecated." 2017-02-24 20:40:23 +00:00
Chen Xu
5e8af2abc7 Merge "renaming telephony internal hidden intents" am: 6d198966fe am: 3b7643ceed
am: 894f17fdc0

Change-Id: I885615dda1831f0acc9007f81094ac14e1eb8cb6
2017-02-24 02:44:03 +00:00
Chen Xu
3b7643ceed Merge "renaming telephony internal hidden intents"
am: 6d198966fe

Change-Id: If1db829fe5308bcbc1d8b778aef50368581850f4
2017-02-24 02:33:53 +00:00
Chen Xu
6d198966fe Merge "renaming telephony internal hidden intents" 2017-02-24 02:24:43 +00:00
fionaxu
abeba60e8f 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: I7183493e2794a82e023bc4993aee328f24b2e7cb
2017-02-23 18:23:34 -08:00
Amit Mahajan
0f551d7f9a Mark oemhook related APIs @Deprecated.
Test: none
Bug: 34344851
Change-Id: I5358d94b3f4cce015effdb3a7517980f369a1224
2017-02-23 17:31:06 -08:00
Brad Ebinger
cd3c59c640 Adds read/modify permission checks to ImsService
This change adds READ/MODIFY_PHONE_STATE permission checks
to the ImsService to ensure that processes without those
permissions do not access this service illegally.

Test: Manual
Change-Id: I7740a9a6b6a12d3f9162aa5d055e7770b05fdff1
2017-02-23 14:30:50 -08:00
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
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 ac9b2c4fab 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
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
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
1ad4f0e60b Merge "Adds @hide ImsService APIs" 2017-02-17 02:09:48 +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