3021 Commits

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

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
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
Amit Mahajan
2e7ca76a8a Adding temporary logging to debug CTS failure (for CellLocationTest).
Bug: 21209629
Change-Id: Ic99cf02f26d3cca7260a3a0141ce13eff9a885bc
2015-06-03 14:53:43 -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