2967 Commits

Author SHA1 Message Date
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
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 0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55.

Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01
2015-04-19 04:59:56 +00:00
Junda Liu
f47c6488ea Merge "Add multi-sim support for getCarrierPackageNamesForIntent." 2015-04-19 04:30:15 +00:00
Svet Ganov
774afb9a8e Fix calling package for app ops
Change-Id: Ie867262e74d0b09e16193cb575b1c1cf942c83cb
2015-04-18 12:14:07 -07:00
Svetoslav
275b5635ad Teach telephony about location app ops
Change-Id: I2bd8f0cb90d161994045d403f5d0c129ea951c3f
2015-04-18 00:03:45 +00:00
Junda Liu
0ff9fd87d0 Add multi-sim support for getCarrierPackageNamesForIntent.
Bug: b/20268073
Change-Id: Id100b7c4606287a1daa90092cd3c8a5a6519247d
2015-04-17 15:51:46 -07:00
Svet Ganov
d3c1ddb892 Merge "Add OP_READ_PHONE_STATE app op - framework" 2015-04-17 21:34:04 +00:00
Yorke Lee
2850d7a599 Set default values for VVM constants in CarrierConfigManager
* Also hide the constants, they don't need to be @SystemApi
* Make VVM_PORT_NUMBER an Int

Bug: 20272209
Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3
2015-04-17 14:24:20 -07:00
Svet Ganov
16a1689950 Add OP_READ_PHONE_STATE app op - framework
The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.

Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
2015-04-17 20:43:56 +00:00
Jay Shrauner
d01242946e Merge "Remove connection substate" 2015-04-16 23:06:05 +00:00
Jay Shrauner
6f20a6a2b4 DO NOT MERGE Remove connection substate
Bug:20300433
Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
2015-04-16 15:05:05 -07:00
Jay Shrauner
8f98843924 Remove connection substate
Bug:20300433
Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
2015-04-16 14:42:39 -07:00
Nancy Chen
5c86e922dd Add keys for visual voicemail carrier configuration values
Each carrier has its own set of visual voicemail configuration values
to be retrieved from the carrier config manager API.

Bug:19236241
Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
2015-04-16 13:55:21 -07:00
Jonathan Basseri
9a1c9b67c4 Adding Carrier Config API.
UICC privileged carrier apps will extend CarrierConfigService to provide
carrier-specific configuration. Apps/services will use
CarrierConfigManager to read the current configuration.

CarrierConfigManager also defines the set of configuration variables and
their default values.

Bug: b/19483786
Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
2015-04-16 11:40:33 -07:00
fenglu
b15e72b83c LCE service implementation - connectivity side
Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6
2015-04-16 02:53:39 -07:00
Casper Bonde
2a5f608e7a Add support for Bluetooth Sim Access Profile (2/4)
Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
2015-04-15 23:45:51 -07:00
fenglu
2bbd2b6830 LCE service implementation - connectivity side
Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6
2015-04-15 23:13:52 -07:00
Vinit Deshpande
dae67ef343 Merge "TelephonyManager Carrier Network Change Notification" 2015-04-16 04:43:21 +00:00
Nancy Chen
48903511b0 Add keys for visual voicemail carrier configuration values
Each carrier has its own set of visual voicemail configuration values
to be retrieved from the carrier config manager API.

Bug:19236241
Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
2015-04-15 17:35:58 -07:00
Jonathan Basseri
3031bf9611 Adding Carrier Config API.
UICC privileged carrier apps will extend CarrierConfigService to provide
carrier-specific configuration. Apps/services will use
CarrierConfigManager to read the current configuration.

CarrierConfigManager also defines the set of configuration variables and
their default values.

Bug: b/19483786
Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
2015-04-15 16:06:51 -07:00
Jay Shrauner
1cf9b6bec1 DO NOT MERGE Make Telecom/InCallUI APIs public
Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
2015-04-15 14:42:24 -07:00
Jay Shrauner
55b97525f0 Make Telecom/InCallUI APIs public
Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
2015-04-15 12:03:48 -07:00
Casper Bonde
d05bd467ba Add support for Bluetooth Sim Access Profile (2/4)
Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
2015-04-15 10:54:08 -07:00