59797 Commits

Author SHA1 Message Date
Wei Wang
e1d0f58aa8 Make Opportunistic Scan API public.
Change-Id: I47da0f7e385f0a72815e493852283a44370aa1ce
2015-03-18 16:38:08 -07:00
Pierre Vandwalle
2877877d4c add BASE_WIFI_LOGGER to system protocol messages
Change-Id: I4bb59b220208d5cb4fa415ad092970312392d8e4
2015-03-18 15:51:06 -07:00
Pavel Zhamaitsiak
c24a5ad099 Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev
automerge: 1d33a37

* commit '1d33a37e0591b27386db2d324313e601cef42527':
  Add format string for displaying SPN in Wi-Fi calling mode.
2015-03-18 19:08:18 +00:00
Erik Kline
d92bd99f65 Merge "Fix missing printf argument." into m-wireless-dev 2015-03-18 00:18:41 +00:00
Erik Kline
f5bd6a9719 Fix missing printf argument.
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
2015-03-18 08:41:42 +09:00
Wei Wang
4190762d94 Add opportunistic ble scan mode. (1/2)
Bug: 19003667
Change-Id: Ibed7e9ec604cb11a58736d168d3d19ece53fc77a
(cherry picked from commit 7508ddf8b53bf350a3424ef71f1ce62ea17006b8)
2015-03-17 22:04:01 +00:00
Lorenzo Colitti
cac9a63cf1 DHCP: Add a hidden setting to use the legacy DHCP client.
Change-Id: I5505bd2c20ddc895df0e9b176e1ed770ad74a3f4
2015-03-17 19:46:13 +09:00
Lorenzo Colitti
4ff9f0fd9f Add a protectFromVpn method that takes a FileDescriptor
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
2015-03-17 19:46:12 +09:00
Lorenzo Colitti
c77f04f9bc Merge changes from topic 'dhcpclient' into m-wireless-dev
* changes:
  DHCP: Minor cleanups to the packet code.
  DHCP: Move the packet code to frameworks/base/services.
  DHCP: Add a native method for making a DHCP socket.
  DHCP: Add a superclass for DhcpStateMachine.
2015-03-16 12:12:42 +00:00
Lorenzo Colitti
30d4ec6201 Merge "Add two utility methods for IPv4 netmasks." into m-wireless-dev 2015-03-16 12:11:37 +00:00
Paul Jensen
21d99435fc Merge "Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK." into m-wireless-dev 2015-03-16 11:59:03 +00:00
Lorenzo Colitti
c95a87f30d DHCP: Move the packet code to frameworks/base/services.
There's no need for it to be in frameworks/base/core, since it
will only be used by services.

Bug: 19704592
Change-Id: I2f5277eca848b7000ca46db575e8602eacb5c8bd
2015-03-16 20:08:46 +09:00
Lorenzo Colitti
566e0cb692 DHCP: Add a native method for making a DHCP socket.
Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be
2015-03-16 20:08:45 +09:00
Lorenzo Colitti
5671eedda0 DHCP: Add a superclass for DhcpStateMachine.
This can be used to switch between different DHCP client
implementations. The caller can declare objects of type
BaseDhcpStateMachine, and call its methods, without needing to
care what implementation is in use.

Bug: 19704592
Change-Id: Icefad9b0d0f83b349681388b1fa16b5e2e37c042
2015-03-16 20:03:09 +09:00
Lorenzo Colitti
475085b987 Add two utility methods for IPv4 netmasks.
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.

Bug: 19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26
2015-03-16 16:07:36 +09:00
Prerepa Viswanadham
30718f433d Per controller tx/rx/idle current values - to be populated in
device overlays

Change-Id: Ib49d2ecc1bcc52ab76d16f236ab54cf5ec5d9864
2015-03-13 13:03:20 -07:00
Pavel Zhamaitsiak
e4fac93dc0 Add format string for displaying SPN in Wi-Fi calling mode.
Bug: 19681794
Change-Id: I31feab956d14accda73288cd43a2aa34db7175ae
2015-03-13 11:31:53 -07:00
Paul Jensen
b335d20628 Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK.
Change-Id: I5ad30a34f96e9e99a557b5bae9a30bfc08c89620
2015-03-13 14:06:12 -04:00
Nancy Chen
8b97ee3c48 Helper methods for voicemail status provider.
Added method to make it easier to insert into the voicemail status
table. Also takes in a phone account for future multi-SIM support.

Remove VvmSyncService class in favor of moving most of the code to
OmtpVvmSyncService.

Bug: 19236241
Change-Id: I5d9def276fbdbc6f825fb35e9fa31bfc3cead1ba
2015-03-11 08:45:00 -07:00
Pavel Zhamaitsiak
4a2ca9da48 Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
automerge: 8b438c8

* commit '8b438c8c1abc3e5e5cce2c9ee22f64c9a5a30290':
  Add strings for IMS Registration error notifications.
2015-03-10 19:34:02 +00:00
Pavel Zhamaitsiak
36d96e0b1e Add strings for IMS Registration error notifications.
Change-Id: I14808e1dbbd14b5124be7303d586638b9e210269
2015-03-09 14:58:19 -07:00
Santos Cordon
2d2bc16f2d Hide calllog entries for unregistered phone accounts
Cherry-picked from master

Change-Id: If1f873dd41c973442fa7a24020e56d13b7b5ad2c
2015-03-05 15:18:40 -08:00
Joe Fernandez
2782f31a73 am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
automerge: 9a447bc

* commit '9a447bcc6ef9be7933cd7197a80f51cbc159cf85':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 18:10:19 +00:00
Joe Fernandez
9a447bcc6e am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 17:54:27 +00:00
Paul Jensen
44f72397be Correct "Sign-in" and "Sign into" to "Sign in to".
bug:19416574
Change-Id: I55cedd2a3e1c1c3192ece860f37c82a55cb6d7c0
2015-03-03 15:46:36 +00:00
Erik Kline
46bdfa90c9 Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev 2015-03-03 06:34:07 +00:00
Joe Fernandez
246a3a4a79 am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:29:33 +00:00
Joe Fernandez
14fcef3bf0 am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:22:42 +00:00
Joe Fernandez
c4418980a0 am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:15:29 +00:00
Andrew Solovay
27f5337841 Minor typo fixes in managed profile Javadoc reference pages.
See first comment for stage location.

bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
2015-03-02 17:22:18 -08:00
Nancy Chen
7c07dfa552 Add frameworks classes and methods necessary for VVM syncadapter structure.
+ VvmSyncService is the base class for all visual voicemail sync
services that run the visual voicemail sync adapter. This class handles
writing to the voicemail provider and receiving changes from the
voicemail provider.
+ AuthenticatorService is a stub class for visual voicemail sync
adapters that do not use an Account (all sync adapters must have an
account associated with them, so a stub account is necessary).
+ Voicemail parcelable object to pass voicemail data around easier. This
is mostly copied from VoicemailProviderDemo
+ Extra helper methods in VoicemailContract to help insert and delete
from the voicemail provider.
+ Add multi-sim fields to VoicemailContract.Voicemails

Bug: 19236241
Change-Id: I603e3e5908704cd043e46221680d8bb600ed2cf4
2015-03-02 20:43:58 +00:00
Santos Cordon
204f80e0aa Add PHONE_ACCOUNT_ADDRESS to the call log DB.
Also update some javadoc comments.

Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842
2015-03-02 20:43:26 +00:00
Santos Cordon
da35a2b477 Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
This reverts commit 87bfb3576f6b76fa9838775e302ca0d74fc0071b.

Change-Id: I8e7056dbd3068b915fecff13128a45bb6e99c073
2015-03-02 20:42:55 +00:00
Santos Cordon
40c6f2b429 Add PHONE_ACCOUNT_ADDRESS to the call log DB.
Also update some javadoc comments.

Change-Id: I018dac4c92b00ecaf2f675623b924776e7698c55
2015-03-02 20:42:13 +00:00
Nancy Chen
109dabdba1 Add multi-SIM fields to VoicemailContract.Status.
In order to support multi-SIM visual voicemail, we need to record the
appropriate phone account in the VoicemailContract.Status table.

Bug: 19236241
Change-Id: I89742ab0aa7780de5cd525731685279ff5024c5e
2015-03-02 11:17:20 -08:00
Erik Kline
3c3ce17c5a Refactor NetworkUtils interaction with DHCP.
Separate out starting DHCP (DISCOVER) and RENEW operations from fetching
the results.  Add NetworkUtils.getDhcpResults(), to enable quick checks
of any available DhcpResults without extraneous interaction with the
DHCP daemon.

Bug: 19422416
Change-Id: I58808e529dda8429737e749f5caef56d923c0809
2015-03-02 12:35:35 +09:00
Lorenzo Colitti
73b0048c70 Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev 2015-02-27 07:09:25 +00:00
Lorenzo Colitti
35e36db1d7 Separate NAT from forwarding.
Bug: 19500693
Change-Id: I39878644e21d51def1c31d1857e815f473ef0938
2015-02-27 15:53:28 +09:00
Yashdev Singh
bece926b51 Telephony: Implementation for IWLAN.
Introduce new RAT as IWLAN.
- Allow registration polling in airplane mode.
- Allow non-default PDP activation for iwlan RAT.

Implementation of iwlan and wwan coexistence.
- A new callback event for unsol oem hook response to indicate
  if cellular and iwlan RAT co-exists.
- If co-existence is possible then allow default PDP activation
  along with other PDPs.

Change-Id: Icc6f8111ec3c86ec06e8facd5a5b60b4d5e08e78
2015-02-26 06:37:36 +00:00
Jim Miller
04d3e55c95 am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API
2015-02-25 18:09:37 +00:00
Jim Miller
bc4f2ccf6c Remove TrustAgent whitelisting API
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
2015-02-24 20:15:02 -08:00
Etan Cohen
9c8f21b5ef WFC configuration: add carrier and device support configurations.
Add keys for global storage of user settings.

Change-Id: Ie1e31b34fa2ad5f970dcd3d97c1bfa9bd5a77427
2015-02-19 00:42:41 +00:00
Natalie Silvanovich
bb4d0676fd am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
* commit '494d5b7757fab576facc5a7e923d2a15650dea1c':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
2015-02-19 00:05:53 +00:00
Marco Nelissen
d0e40040eb am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE
2015-02-18 00:01:16 +00:00
Marco Nelissen
ffaee8bda9 Merge "Fix NPE" into lmp-mr1-dev 2015-02-17 23:54:30 +00:00
Craig Mautner
a94e42970d Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 2015-02-17 23:30:34 +00:00
Alan Viverette
bed5a61fd0 am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
  Fix year picker initial range
2015-02-17 22:36:00 +00:00
Marco Nelissen
0e24cb7fb5 Fix NPE
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.

Bug: 19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
2015-02-17 14:35:37 -08:00
Alan Viverette
2a90fa6d94 Fix year picker initial range
BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
2015-02-17 21:11:36 +00:00
Craig Mautner
ca0653a424 Do not make ActivityContainer available to apps. DO NOT MERGE
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-17 20:41:39 +00:00