Commit Graph

880 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
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 9444f4be82.

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
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
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
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
Cheuksan Wang
712cdaf48e Merge "Fail SmsManager requests if SubId is not active." into m-wireless-dev 2015-04-24 21:40:11 +00:00
Jonathan Basseri
9892718663 Never return a reference to sDefaults.
Final static fields in Java are still mutable, so CarrierConfigManager
should not give callers the opportunity to mutate them.

Change-Id: I413597fc5f59c249997967bb0aad2d09b54fa613
2015-04-23 23:34:15 -07:00
Jonathan Basseri
48f8fe53ee Merge "Adding carrier variables to control certain network settings." 2015-04-23 22:35:10 +00:00
Jonathan Basseri
ad5baab57e Adding carrier variables to control certain network settings.
Bug: 20270007
Change-Id: I4075c159e4fceb2e8a5bdda1261f8b2470455595
2015-04-23 15:26:15 -07:00
Sooraj Sasindran
4f18c60f48 Make sure to return network type after conversion
After converting raf to type, make sure to return
network type

Change-Id: I7fd338717be98a055cbaed66d1b15417da27a3d8
2015-04-23 12:04:08 -07:00
Abhishek Adappa
c180f9adf7 Radio Access Family related fixes
1. Include EHRPD in the EVDO group
2. Fix mapping of CDMA network type to include EVDO
3. Add utility to get the network type from the Raf

Change-Id: I35023083be4c681809c003c7ed6a31c698ea4647
2015-04-23 11:33:30 -07:00
Todd Kennedy
cf5715eb30 Merge "Unhide SignalStrength#getLevel()" 2015-04-22 17:37:50 +00:00
Todd Kennedy
af86120955 Unhide SignalStrength#getLevel()
Bug: 20410696
Change-Id: I9f7f8c2949a9fdf5f84c4b567898c240034f5e85
2015-04-21 14:25:48 -07:00
Svet Ganov
24aadf18d5 Merge "Add OP_READ_PHONE_STATE app op continued - framework" 2015-04-21 19:52:11 +00:00
Jonathan Basseri
5f24126e2e Merge "Add multi-sim support for getCarrierPackageNamesForIntent." 2015-04-20 19:59:39 +00:00
Stuart Scott
f1fb39763d Move factoryReset to service and protect.
bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
2015-04-20 10:52:35 -07:00
Junda Liu
f3c7bf432d Add multi-sim support for getCarrierPackageNamesForIntent.
resbmit of change Id100b7c4606287a1daa90092cd3c8a5a6519247d

Bug: 20268073
Change-Id: I852aac4da492e15f1dd7a3c88693fa14ec07b7c4
2015-04-20 10:30:35 -07:00
Svet Ganov
21301f6016 Add OP_READ_PHONE_STATE app op continued - framework
Change-Id: If1c2783ad9ea2aa773e5416e09a3cfd1817ef73f
2015-04-18 22:49:28 -07:00
Jeff Sharkey
7227436671 Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent."" 2015-04-19 05:00:29 +00:00
Jeff Sharkey
1b7ed7b1c2 Revert "Add multi-sim support for getCarrierPackageNamesForIntent."
This reverts commit 0ff9fd87d0.

Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01
2015-04-19 04:59:56 +00:00