3002 Commits

Author SHA1 Message Date
Nancy Chen
65561b5c51 Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev 2015-06-04 21:09:45 +00:00
Amit Mahajan
b2556363e7 Fixed punctuation in comment.
Bug: 21559800
Change-Id: I47dc8e7be809cc586c307e72c7e9e11d5268cd5f
2015-06-04 12:19:40 -07:00
Amit Mahajan
b8a4ba86d8 Merge "Update getVoiceMessageCount() comments." into mnc-dev 2015-06-04 19:14:07 +00:00
Amit Mahajan
5347753188 Update getVoiceMessageCount() comments.
Bug: 21559800
Change-Id: I7a737ae8a93c59391f232b5da6e3b36874126f3a
2015-06-04 12:05:18 -07:00
Nancy Chen
97f5ccd1cc Add carrier package name field to check for carrier vvm app.
The carrier's vvm app's package name will be checked so that if it is
already installed, the dialer vvm will be disabled.

Bug: 2112648e#
Change-Id: I0433037f3bc5c5a380c76a03090d61c430e47e4b
2015-06-04 12:00:25 -07:00
Jonathan Basseri
b06411a90f Merge "Document procedure for adding carrier config variables." into mnc-dev 2015-06-03 20:59:13 +00:00
Tyler Gunn
bb6d060585 Merge "API Cleanup: Remove VideoState class." into mnc-dev 2015-06-03 17:13:41 +00:00
Tyler Gunn
87b73f370e API Cleanup: Remove VideoState class.
- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.

Bug: 21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
2015-06-03 10:09:59 -07:00
Jonathan Basseri
97769b0c43 Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 2015-06-02 23:14:45 +00:00
Brian Attwell
115c04410e Rename PhoneNumberUtils APIs
In response to more API review.

Bug: 21571895
Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a
2015-06-02 21:34:33 +00:00
Jonathan Basseri
f31ac338af Migrating MmsConfig to CarrierConfigManager.
Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

This was originally Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a

Bug: 21085630
Change-Id: I5a55873465c36ea8a7e3915b8b98a65b47c60dfa
2015-06-02 14:29:04 -07:00
Jonathan Basseri
abdf79aba0 Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev 2015-06-02 21:15:05 +00:00
Jonathan Basseri
27a7b78e40 Revert "Migrating MmsConfig to CarrierConfigManager."
Forgot to update-API

This reverts commit 9444f4be82d2bbc6b8668e73e91cfa70aee2d4dc.

Change-Id: I8e1bb7ff5b86d478ae7a79497d28ee9310209de6
2015-06-02 21:13:48 +00:00
Adrian Roos
56dbe3ee4b Merge "Hide and disable emergency assist API" into mnc-dev 2015-06-02 20:50:55 +00:00
Jonathan Basseri
9444f4be82 Migrating MmsConfig to CarrierConfigManager.
Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

Bug: 21085630
Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a
2015-06-02 10:08:08 -07:00
Jonathan Basseri
08e318e586 Document procedure for adding carrier config variables.
Readers of CarrierConfigManager.java should find enough info in the
comments to add new variables and override them in either their own
carrier app or the default carrier app.

Change-Id: Ib1d87c24543491ad8b4ef0b1d08148a07fb1ace3
2015-05-29 10:12:23 -07:00
Brian Attwell
19d9d0ca2e Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev 2015-05-28 23:43:47 +00:00
Brian Attwell
1a15ab91bc Rename "end" to "endExclusive" in addPhoneTtsSpan
Bug: 21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025
2015-05-28 16:23:37 -07:00
Amit Mahajan
ff0c25ce31 Merge "Cleaning up logging in TelephonyManager." into mnc-dev 2015-05-28 23:05:29 +00:00
Amit Mahajan
56548d578c Cleaning up logging in TelephonyManager.
Bug: 21474174
Change-Id: I4555ada69c233ee9e9d9e45c1d619e8b779d9016
2015-05-28 11:39:23 -07:00
Nancy Chen
ec7100d011 Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev 2015-05-28 17:17:19 +00:00
Narayan Kamath
7ff76d637f Add a hidden telephony API for querying SIM derived locales.
bug: 19818550
Change-Id: Ide6c05ad8fe7b0cff6f20ddfe755e83e9b3a21aa
2015-05-28 08:59:27 +00:00
Zach Johnson
42ecc9eb90 Drop the "Config". Just "CarrierService". It's cleaner.
b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
2015-05-27 15:30:31 -07:00
Nancy Chen
cb43f420fc Update docstring for STRING_VVM_TYPE to point to possible values.
The possible values for CarrierConfgiManager.STRING_VVM_TYPE now live in
TelephonyManager. Update the reference.

Bug: 21446369
Change-Id: I85e3ab4f64d54f0cb8bf16b2ada67cae36cefdd2
2015-05-27 15:06:58 -07:00
Adrian Roos
46fa08d664 Hide and disable emergency assist API
Bug: 21471480
Change-Id: If53926ebd6451b05ccacf06342cc648185dc5eaf
2015-05-27 14:42:30 -07:00
Nancy Chen
9e4cd8332a Add vvm type for t-mobile.
T-Mobile has slightly different configuration details so add a vvm type
to correspond to what they use: comverse vvm.

Bug: 21126480
Change-Id: I83fd0c5651bf94eb912dd44f4b52924d8bcdd4e7
2015-05-25 10:39:37 -07:00
Robert Greenwalt
8c621ef546 Add support for static RadioCapabilities.
Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY.  Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that.  B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I49e4527fe94919a7094bc7c1e100d20e8f833865
2015-05-13 17:04:03 -07:00
Junda Liu
07e02b6d25 Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev 2015-05-13 22:09:22 +00:00
Jonathan Basseri
b731c3d944 Add null annotations for getting carrier config.
CarrierConfigManager can return null Bundles for carrier config, but
never returns null when getting default values. Add the appropriate
annotations.

Change-Id: Iffbed3b54ca7cc28cf8b04f133aacdf9e6e4fd20
2015-05-13 14:58:28 -07:00
Junda Liu
cd115b738c Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.
Bug: b/21028396
Change-Id: I029671b6bcd03a07956ccf35f4e5fe03d16a2218
2015-05-13 14:57:48 -07:00
Jonathan Basseri
4f9ad1678e Switching to PersistableBundle in carrier config API.
Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.

In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.

Bug: 20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
2015-05-13 10:45:29 -07:00
Yorke Lee
32f2473160 More video related API fixes
android.telecom.Connection.VideoProvider
* onSetPauseImage takes Uri instead of String
* changeCallDataUsage -> setCallDataUsage
* add quality constants to changeVideoQuality() docs

android.telecom.InCallService.VideoCall
* setPauseImage takes Uri instea dof String

android.telecom.VideoProfile.VideoState
* Move constants to VideoProfile, prefix with STATE_

Bug: 21040387
Bug: 21066505
Change-Id: I764e72aced9d1e2d30d6d0cf0862100860d47c79
2015-05-12 16:45:14 -07:00
Yorke Lee
400470fab9 Fixes for APi review
Move CameraCapabilities into VideoProfile
Make PhoneAccount and PhoneAccountHandle final

Bug: 21040387
Bug: 21066505
Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
2015-05-12 13:31:25 -07:00
Tyler Gunn
ed7cbf111f Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev 2015-05-06 16:01:36 +00:00
Tyler Gunn
4538216a31 Change sendSessionModifyRequest VideoProvider API signature.
Including a fromProfile in addition to the requestedProfile.

- Changed VideoCallImpl to generate the fromVideoProfile based on the
call's current videoState.  This ensures the InCall UI only needs to
pass in the new video profile; the VideoCall Impl already has enough
knowledge to generate the fromProfile.
  - Changed VideoCallImpl to track the current videoQuality, which forms
a part of the fromVideoProfile.

Bug: 20704229
Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
2015-05-06 08:52:27 -07:00
Pavel Zhamaitsiak
b2e3b74418 Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev 2015-05-05 21:05:49 +00:00
Pavel Zhamaitsiak
5504d39b7f WiFi Calling: Show different operator name string in Data usage dialog.
Bug: 19950657
Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef
(cherry picked from lmp-mr1-wfc-dev)
2015-05-05 13:59:28 -07:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
Amit Mahajan
13a98b6c6e Support for bearer_bitmask.
Change-Id: I7cae3d229445607c66b6472124264588f7571097
2015-05-01 16:40:56 +00:00
Yorke Lee
1fec804059 am 89319a95: am e6a8bf80: am 08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
* commit '89319a9562d2b205a6b004a04e132b0219f92f9c':
  Add default dialer checks to Telecom/Telephony
2015-04-30 19:26:17 +00:00
Yorke Lee
08b51bfe85 Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev 2015-04-30 18:49:58 +00:00
Yorke Lee
f1a349bda3 Add default dialer checks to Telecom/Telephony
Check for the default dialer or the modify phone state permission
for various TelecomManager/TelephonyManager methods.

Make sure to check the user-selected default rather than the
hardcoded package name.

Exercise this code in TestDialerActivity.

Bug: 20304458
Change-Id: Ic04cd8f2ba98e1d54c39549ae89d3e11cd5cdafb
2015-04-29 16:21:00 -07:00
Junda Liu
a7a6708510 am 01da3124: am df3a6f3e: am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
* commit '01da31247b8b2999bcfefe1f55ca396ee177ad69':
  Moving all Telephony overlays to CarrierConfigManager.
2015-04-29 21:02:25 +00:00
Jonathan Basseri
9b56ad8f1a Moving all Telephony overlays to CarrierConfigManager.
This adds every variable and its default value from
packages/services/Telephony/res/values/config.xml to the new
CarrierConfigManager API. Variable docstrings are also taken from
config.xml, with minimal edits.

These variables were not included because either they are not carrier
specific, or they are device specific:

OtaPlaySuccessFailureTone
OtaShowActivateFailTimes
OtaShowActivationScreen
OtaShowListeningScreen
carrier_settings
carrier_settings_menu
config_allow_hfa_outside_of_setup_wizard
config_enabled_lte
csp_enabled
dialer_default_class
dtmf_type_enabled
hac_enabled
send_mic_mute_to_AudioManager
ui_default_package

This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement
for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS.

Bug: 20270007
Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
2015-04-29 13:23:21 -07:00
Sharvil Nanavati
61a3ab090f Use a separate intent action for subscription phone state changes.
Global phone state changes and subscription phone state changes
are aliased to the same intent. As a result, apps can't distinguish
between the two types of updates.

This change teases the two apart by using a different intent action
for each type of phone state change. This will break carrier apps
that depend on subscription phone state changes, but will fix state
inconsistencies in non-carrier apps.

Bug: 20309009
Change-Id: Ie81c37247917573a3ef5d957fda1087c16736e85
2015-04-27 19:00:13 +00:00
Etan Cohen
cd895cdf4d Merge changes from topic 'mwd-merge-042415'
* changes:
  Rename removeVideoCallListener to unregisterCallback
  Bluetooth document fix: remove reference from open API to hidden entities
  Fix build due to merge of 7595842 and renaming due to 8eb87f0
  Merge commit '052a0da' into merge2
  Merge commit 'db1dbb8' into merge2
  Merge commit '7e5e791' into merge2
  Merge commit '170102d' into merge2
  Merge commit '4cb5d80' into merge2
  Merge commit '83cda00' into merge2
  Merge commit 'c91bc62' into merge2
  Merge commit 'cffc360' into merge2
  Merge commit '7f61051' into merge2
  Merge commit '167c3a7' into merge2
  Merge commit '4467b98' into merge2
  Merge commit '25a217c' into merge2
  Merge commit '04b18ec' into merge2
  Merge commit '7595842' into merge2
  Merge commit '2bbd2b6' into merge2
  Merge commit '4890351' into merge2
  Merge commit 'cd405fe' into merge2
  Merge commit '6ddbb5e' into merge2
  Merge commit 'de93575' into merge2
  Merge commit '9561e74' into merge2
2015-04-25 00:51:47 +00:00
Cheuksan Wang
890eb710f9 Merge "add injectSmsPdu with subId to ISms.aidl" into m-wireless-dev 2015-04-24 23:35:25 +00:00
Cheuksan Wang
712cdaf48e Merge "Fail SmsManager requests if SubId is not active." into m-wireless-dev 2015-04-24 21:40:11 +00:00
Etan Cohen
fa96c94c30 Merge commit '9561e74' into merge2 2015-04-24 13:43:36 -07:00