Commit Graph

3053 Commits

Author SHA1 Message Date
Jonathan Basseri
cb8bb39001 Merge "Add VVM carrier config to public API." into mnc-dev 2015-06-19 06:16:48 +00:00
Fyodor Kupolov
7e603d6994 Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev 2015-06-18 23:17:01 +00:00
Jonathan Basseri
6c1dc315aa Add VVM carrier config to public API.
These bits of carrier config were @hidden, but in order for carrier apps
to set them, they need to be public.

Bug: 21930513
Change-Id: Ifa49cf7441a8c6b6cf7e1aadb46abeb41054fcc3
2015-06-18 16:05:39 -07:00
Sanket Padawe
330dcac0cb SubscriptionManager: Fix NPE in getSimStateForSlotIdx
bug: 21915589
Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
2015-06-18 12:08:01 -07:00
Fyodor Kupolov
d24e4eafdb OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds
Bug: 21726452
Bug: 21878243
Change-Id: I390386e28d8f948b8672a212ac413dfa61e54a15
2015-06-17 15:34:03 -07:00
Chris Manton
69dd4bba65 Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev 2015-06-17 21:21:40 +00:00
Andrew Lee
94f3082495 Merge "Add DisconnectCause for CDMA activated case." into mnc-dev 2015-06-17 20:42:06 +00:00
Junda Liu
a5aabfebca Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev 2015-06-17 18:11:03 +00:00
Junda Liu
e15cca771c Add carrier config variable to hide sim lock setting ui.
Bug: b/19623656
Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
2015-06-17 10:57:23 -07:00
Chris Manton
ca16a79b18 Add keys to handle GSM and CDMA roaming/non roaming overrides
bug: 20828356

Change-Id: Icb5ad25e213771554915bd9479a4a66b4f4a6906
2015-06-17 08:25:48 -07:00
Andrew Lee
0c4d2e84cf Add DisconnectCause for CDMA activated case.
Bug: 19296388
Change-Id: Ic754534e6d0273ae73ed80e3bb25a681d410a03b
2015-06-16 16:42:31 -07:00
Fyodor Kupolov
27a88a3eb6 Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev 2015-06-16 17:15:03 +00:00
Junda Liu
73d0432324 Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 2015-06-15 23:54:38 +00:00
Junda Liu
e478649373 Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
2015-06-15 16:12:02 -07:00
Amit Mahajan
28a8cf6883 Merge "Adding config variables for triggering CI action on System update." into mnc-dev 2015-06-15 22:16:41 +00:00
Jonathan Basseri
ecadb92e8d Merge "Read MMS config from CarrierConfigManager." into mnc-dev 2015-06-12 04:41:41 +00:00
Amit Mahajan
02008b78d0 Adding config variables for triggering CI action on System update.
Bug: 21603815
Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
2015-06-11 15:50:52 -07:00
Jonathan Basseri
b2af4220ad Merge "Delete TODO and file a bug." into mnc-dev 2015-06-11 15:36:34 +00:00
Jonathan Basseri
3360c26579 Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL
Disabling voice privacy sounds scary. Update this config variable name
to what it actually does, which is to hide some settings UI.

Bug: 21571894
Change-Id: Ib981b5e442b56d0167a19326fe34935b7a1cfbf1
2015-06-10 20:57:40 -07:00
Jonathan Basseri
5bf0ca1b3a Delete TODO and file a bug.
This TODO looks more like a feature request, so I filed b/21766386 to
evaluate the feature. We should remove the TODO especially because this
text is in the public API.

Note: I'm not deleting the exact same comment from
packages/services/Telephony/res/values/config.xml
because the data migrated to CarrierConfigManager is slated to be
deleted from config.xml files.

Bug: 21571894
Change-Id: Iaba042fb47ade24f5825a48b21960193d322363f
2015-06-10 20:52:14 -07:00
Jonathan Basseri
6694f2a067 Read MMS config from CarrierConfigManager.
Updating javadoc to point at the correct class.

Bug: 21085630
Change-Id: I02415191c8d331e431812ddba75f18af10805b98
2015-06-10 19:58:03 -07:00
Fyodor Kupolov
735e61b30f Additional OP_READ_PHONE_STATE AppOps checks for telephony
Bug: 21726452
Change-Id: Iab61372d0fc8cecc826564a218ff542ec4afde5c
2015-06-10 17:32:13 -07:00
Robert Greenwalt
1f86c1ae83 Merge "Update docs on SignalStrength.getLevel" into mnc-dev 2015-06-10 23:59:00 +00:00
Robert Greenwalt
46982c5364 Update docs on SignalStrength.getLevel
bug:21572049
Change-Id: I10b830859a253170184a2d874d0ed39fc6ee0503
2015-06-10 16:00:41 -07:00
Jeff Davidson
a66a067a9c Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev 2015-06-10 22:40:29 +00:00
Santos Cordon
8c332b7275 TelephonyManager should use TelecomManager's getCallState().
Telecom's version includes non-cellular calls in its result. Many apps
compile against TelephonyManager's existing API so we should update it
to use telecom instead.

We kept the implementation as cellular-only for
getCallState[ForSubscription](...) version of the API (which is hidden
anyway).

Bug: 21732997
Change-Id: Ifd27e6b49d76fe96ccc969e5262b1a876670aeef
2015-06-10 11:42:27 -07:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Tyler Gunn
69c4e2c57e Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 2015-06-09 22:04:10 +00:00
Jeff Davidson
0cf20cdf81 Mark CARRIER_PRIVILEGE_* constants as @SystemApi.
These constants are returned by checkCarrierPrivilegesForPackage which
is marked as @SystemApi, so this seems like an oversight.

Bug: 21613234
Change-Id: I5efc2c305cb1870e42fb103578fe33ec3e6000d4
2015-06-09 14:40:21 -07:00
Tyler Gunn
bc6f12ee42 Remove use of STATE_AUDIO_ONLY in a comparison.
- Cleanup javadoc to make it more explicit how to use STATE_AUDIO_ONLY.
- Use VideoProfile.isAudioOnly() instead of doing == comparison.

Bug: 21645094
Change-Id: I5a67290a996f8f338aebab72a4d3cb57f1b1993b
2015-06-09 14:34:11 -07:00
Andrew Flynn
ceaed68b07 notifyCarrierNetworkChange:TelephonyManager->CarrierService
Re-checkin of 7f8be9d89b.

ORIGINAL CHANGES:

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
  new internal callers that want to bind to it.

ADDITIONAL CHANGES:

- Fixes stack so that a SecurityException is thrown when caller
  does not have MODIFY_PHONE_STATE or carrier privileges.

Bug: 21572049
Bug: 21630803
Bug: 21721768

Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
2015-06-09 16:28:54 -04:00
Fyodor Kupolov
309b2f63f3 Do not enforce PHONE_STATE_PERMISSION to register listener
PHONE_STATE_PERMISSION should not be required to register to the following
event types:
- PhoneStateListener.LISTEN_CALL_STATE
- PhoneStateListener.LISTEN_DATA_ACTIVITY
- PhoneStateListener.LISTEN_DATA_CONNECTION_STATE

In case of LISTEN_CALL_STATE, an empty string should be passed instead of
incomingNumber, when caller has no PHONE_STATE_PERMISSION.

Bug: 21588537
Change-Id: I5b6d0308924f7e4cd13a983b8e0c9b3a5bbb119b
2015-06-09 12:44:39 -07:00
Zach Johnson
d56958c440 Merge "Ignore carrier apps when checking for idleness" into mnc-dev 2015-06-09 00:06:29 +00:00
Prerepa Viswanadham
8711ed644b Merge changes from topic 'modemActivityInfo' into mnc-dev
* changes:
  API for get modem activity info
  Activity info and stats from modem
2015-06-08 23:44:51 +00:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
2015-06-08 14:59:09 -07:00
Zach Johnson
b4b9ca7580 Ignore carrier apps when checking for idleness
Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
2015-06-08 13:49:13 -07:00
Nathan Harold
71feb72b76 Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev 2015-06-08 20:05:07 +00:00
Andrew Flynn
21a4f17c94 Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 2015-06-08 19:59:51 +00:00
Andrew Flynn
2b5348b413 Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
This reverts commit 7f8be9d89b.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
2015-06-08 19:59:29 +00:00
Nathan Harold
fde06fd323 Fix a typo in the docstring of getAllCellInfo()
Change-Id: I5ac23e708926a1ca649ace3890af417c9607e0e9
2015-06-08 12:38:40 -07:00
Amit Mahajan
829c097761 Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev 2015-06-08 17:27:29 +00:00
Amit Mahajan
9b5e2124d0 Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev 2015-06-08 17:26:03 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Amit Mahajan
9387f1dfe3 Changing getSimState to use slot idx instead of sub id.
Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
2015-06-08 17:01:23 +00:00
Sanket Padawe
912f705f1f Merge "Suppress default logging in SubscriptionManager." into mnc-dev 2015-06-05 23:45:45 +00:00
Sanket Padawe
28964eb236 Suppress default logging in SubscriptionManager.
Bug: 20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7
2015-06-05 16:13:51 -07:00
Jonathan Basseri
69822f0d63 Renaming carrier config variable keys.
API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab
2015-06-05 15:08:55 -07:00
Andrew Flynn
7f8be9d89b notifyCarrierNetworkChange:TelephonyManager->CarrierService
Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
  new internal callers that want to bind to it.

Bug: 21572049
Bug: 21630803
Change-Id: Idcbcd107966fe92d7edc23c261e11db61160f615
2015-06-05 09:20:17 -04:00
Prerepa Viswanadham
3d0f09433a API for get modem activity info
Change-Id: I4785e1dfce14468de8ba5a376c7c3aa57178ce7b
2015-06-05 02:11:26 +00:00
Prerepa Viswanadham
5c72899431 Activity info and stats from modem
Change-Id: Ifa8e520673c7e5549b0066a16a744810f1f0730c
2015-06-05 02:10:51 +00:00