Commit Graph

1600 Commits

Author SHA1 Message Date
Brad Ebinger
d31314d550 Merge "Disable a phone number log for user build"
am: 59a40691a5

Change-Id: I9b2a14b29fe5e096b734b6e3f1d4b65806753646
2017-03-09 21:46:39 +00:00
Brad Ebinger
59a40691a5 Merge "Disable a phone number log for user build" 2017-03-09 21:39:00 +00:00
Brad Ebinger
2a71bd5150 Merge "Return generic Binder on onBind"
am: c6613f7206

Change-Id: Ibc8cce3c63b93820f6bdd842e6a751233240874d
2017-03-08 20:02:03 +00:00
youhei.x.miyoshi
b3cd7b51d3 Disable a phone number log for user build
A phone number is privacy data. Therefore, it should be prevented
from logging in user build.

Test: manual - checked log
Bug: 34582911
Change-Id: Id040653dbfd236250e7eb07c9c2e9587ded3d63f
2017-03-06 14:53:10 +09:00
Brad Ebinger
d2369792dd Return generic Binder on onBind
By returning a generic Binder on onBind in
ImsServiceBase, we can detect when the process
crashes and restart the service, if necessary.

Test: Telephony Unit Tests
Change-Id: I2fbe2708c3df37704f0c526210267a35c75ee1eb
2017-03-03 10:15:09 -08:00
Elliott Hughes
6f00e6e977 Merge "Remove the name length limit for system properties."
am: c657b769ab

Change-Id: I700b379c0482d7d9609183a39a5c9664746ea5aa
2017-03-03 00:30:10 +00:00
Elliott Hughes
33cc60ccc9 Remove the name length limit for system properties.
Bug: http://b/33926793
Test: builds
Change-Id: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
Merged-In: Ib89b66b7abebc9a28961a0c9032b99947e3db0d6
2017-03-02 14:17:03 -08: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
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
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
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
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
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
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
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
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
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
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
Brad Ebinger
c9c8b590c5 Merge "Adds @hide ImsService APIs" am: 2b879016d3
am: f46aa6f9ee

Change-Id: I12e10d796a7b2d56cacf8e9b53bb5e228b79ecc3
2017-02-17 20:29:13 +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
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
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
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