summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Add VVM carrier config to public API." into mnc-devJonathan Basseri2015-06-192-15/+3
|\ \ \
| * | | Add VVM carrier config to public API.Jonathan Basseri2015-06-182-15/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-devFyodor Kupolov2015-06-182-2/+2
|\ \ \
| * | | OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIdsFyodor Kupolov2015-06-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 21726452 Bug: 21878243 Change-Id: I390386e28d8f948b8672a212ac413dfa61e54a15
* | | | SubscriptionManager: Fix NPE in getSimStateForSlotIdxSanket Padawe2015-06-181-4/+7
| |_|/ |/| | | | | | | | | | | bug: 21915589 Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
* | | Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into ↵Chris Manton2015-06-171-0/+33
|\ \ \ | | | | | | | | | | | | mnc-dev
| * | | Add keys to handle GSM and CDMA roaming/non roaming overridesChris Manton2015-06-171-0/+33
| | |/ | |/| | | | | | | | | | | | | bug: 20828356 Change-Id: Icb5ad25e213771554915bd9479a4a66b4f4a6906
* | | Merge "Add DisconnectCause for CDMA activated case." into mnc-devAndrew Lee2015-06-171-5/+13
|\ \ \ | |_|/ |/| |
| * | Add DisconnectCause for CDMA activated case.Andrew Lee2015-06-161-5/+13
| | | | | | | | | | | | | | | Bug: 19296388 Change-Id: Ic754534e6d0273ae73ed80e3bb25a681d410a03b
* | | Merge "Add carrier config variable to hide sim lock setting ui." into mnc-devJunda Liu2015-06-171-0/+5
|\ \ \ | |_|/ |/| |
| * | Add carrier config variable to hide sim lock setting ui.Junda Liu2015-06-171-0/+5
| | | | | | | | | | | | | | | Bug: b/19623656 Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
* | | Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-devFyodor Kupolov2015-06-162-33/+33
|\ \ \ | |_|/ |/| |
| * | Additional OP_READ_PHONE_STATE AppOps checks for telephonyFyodor Kupolov2015-06-102-33/+33
| | | | | | | | | | | | | | | Bug: 21726452 Change-Id: Iab61372d0fc8cecc826564a218ff542ec4afde5c
* | | Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." ↵Junda Liu2015-06-151-1/+17
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.Junda Liu2015-06-151-1/+17
| | |/ | |/| | | | | | | | | | Bug: b/21499566 Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
* | | Merge "Adding config variables for triggering CI action on System update." ↵Amit Mahajan2015-06-151-0/+32
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | Adding config variables for triggering CI action on System update.Amit Mahajan2015-06-111-0/+32
| | | | | | | | | | | | | | | | | | | | Bug: 21603815 Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
* | | | Merge "Read MMS config from CarrierConfigManager." into mnc-devJonathan Basseri2015-06-121-6/+4
|\ \ \ \
| * | | | Read MMS config from CarrierConfigManager.Jonathan Basseri2015-06-101-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating javadoc to point at the correct class. Bug: 21085630 Change-Id: I02415191c8d331e431812ddba75f18af10805b98
* | | | | Merge "Delete TODO and file a bug." into mnc-devJonathan Basseri2015-06-111-5/+0
|\ \ \ \ \
| * | | | | Delete TODO and file a bug.Jonathan Basseri2015-06-101-5/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOLJonathan Basseri2015-06-101-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Update docs on SignalStrength.getLevel" into mnc-devRobert Greenwalt2015-06-101-1/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update docs on SignalStrength.getLevelRobert Greenwalt2015-06-101-1/+6
| | | | | | | | | | | | | | | | | | | | bug:21572049 Change-Id: I10b830859a253170184a2d874d0ed39fc6ee0503
* | | | Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-devJeff Davidson2015-06-101-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Mark CARRIER_PRIVILEGE_* constants as @SystemApi.Jeff Davidson2015-06-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These constants are returned by checkCarrierPrivilegesForPackage which is marked as @SystemApi, so this seems like an oversight. Bug: 21613234 Change-Id: I5efc2c305cb1870e42fb103578fe33ec3e6000d4
* | | | TelephonyManager should use TelecomManager's getCallState().Santos Cordon2015-06-101-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-devAndrew Flynn2015-06-101-29/+0
|\ \ \ \
| * | | | notifyCarrierNetworkChange:TelephonyManager->CarrierServiceAndrew Flynn2015-06-091-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-checkin of 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f. 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
* | | | | Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-devTyler Gunn2015-06-091-1/+1
|\ \ \ \ \
| * | | | | Remove use of STATE_AUDIO_ONLY in a comparison.Tyler Gunn2015-06-091-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | Do not enforce PHONE_STATE_PERMISSION to register listenerFyodor Kupolov2015-06-091-4/+5
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Ignore carrier apps when checking for idleness" into mnc-devZach Johnson2015-06-092-4/+24
|\ \ \ \
| * | | | Ignore carrier apps when checking for idlenessZach Johnson2015-06-082-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also introduce a way to check if a package has carrier privileges for any active phone. Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
* | | | | Merge changes from topic 'modemActivityInfo' into mnc-devPrerepa Viswanadham2015-06-085-0/+202
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: API for get modem activity info Activity info and stats from modem
| * | | | | API for get modem activity infoPrerepa Viswanadham2015-06-051-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4785e1dfce14468de8ba5a376c7c3aa57178ce7b
| * | | | | Activity info and stats from modemPrerepa Viswanadham2015-06-054-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa8e520673c7e5549b0066a16a744810f1f0730c
* | | | | | Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubIdJonathan Basseri2015-06-082-5/+6
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per discussion with API council, "notify" makes more sense than "reload" here. Bug: 21571894 Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
* | | | | Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-devNathan Harold2015-06-081-1/+1
|\ \ \ \ \
| * | | | | Fix a typo in the docstring of getAllCellInfo()Nathan Harold2015-06-081-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I5ac23e708926a1ca649ace3890af417c9607e0e9
* | | | | Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" ↵Andrew Flynn2015-06-081-0/+29
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | into mnc-dev
| * | | | Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"Andrew Flynn2015-06-081-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f. Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
* | | | | Merge "Adding temporary logging to debug CTS failure (for ↵Amit Mahajan2015-06-081-3/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | CellLocationTest)." into mnc-dev
| * | | | | Adding temporary logging to debug CTS failure (for CellLocationTest).Amit Mahajan2015-06-031-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21209629 Change-Id: Ic99cf02f26d3cca7260a3a0141ce13eff9a885bc
* | | | | | Merge "Changing getSimState to use slot idx instead of sub id." into mnc-devAmit Mahajan2015-06-083-14/+27
|\ \ \ \ \ \
| * | | | | | Changing getSimState to use slot idx instead of sub id.Amit Mahajan2015-06-083-14/+27
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 20736251 Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
* | | | | | Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-devAndrew Flynn2015-06-081-29/+0
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | notifyCarrierNetworkChange:TelephonyManager->CarrierServiceAndrew Flynn2015-06-051-29/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Suppress default logging in SubscriptionManager." into mnc-devSanket Padawe2015-06-051-3/+9
|\ \ \ \
| * | | | Suppress default logging in SubscriptionManager.Sanket Padawe2015-06-051-3/+9
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 20465753 Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7