160881 Commits

Author SHA1 Message Date
Pierre Vandwalle
af3f1c995c Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev
automerge: 7c39808

* commit '7c398083319bbd1ad51d23cb307cfc3ac9091c3a':
  export API to disable autojoin scan initial implementation
2015-03-19 02:58:01 +00:00
Pierre Vandwalle
2877877d4c add BASE_WIFI_LOGGER to system protocol messages
Change-Id: I4bb59b220208d5cb4fa415ad092970312392d8e4
2015-03-18 15:51:06 -07:00
xinhe
9954faa70d Change rtt Framework interface
Bug:19735392
Change-Id: I0886d3c0e40a6dd5477c81a5df5dbc2746942ec3
2015-03-18 22:26:48 +00:00
Tyler Gunn
d11a31561e resolve merge conflicts of bcb17eb to m-wireless-dev.
Change-Id: Ic8211fb14caec993c8e38c790006577493f7a607
2015-03-18 13:09:14 -07:00
Brian Carlstrom
f9296808e9 am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
automerge: 6a6cf63

* commit '6a6cf634f527cdde9382e8fabb4de5aaad748879':
  Update vmSafeMode documentation
2015-03-18 19:08:26 +00: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
Deepanshu Gupta
8c4e96f62e am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
automerge: 579535a

* commit '579535acfa1c5c093b5152cf6f20603b273137be':
  Fix AppCompat action bar theming.
2015-03-18 19:08:09 +00:00
Deepanshu Gupta
7cbbc70d93 am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
automerge: cc5c1a5

* commit 'cc5c1a57b05b2cda45936172bbe91a52ae9adee6':
  Fix NoActionBar themes rendering.
2015-03-18 19:08:01 +00:00
Luan Nguyen
25811656cf am 0d756f7d: am 217a4356: am a8bdd2f3: am 42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
automerge: 7962ae3

* commit '7962ae36eb8be221753f2b3c75bdb676beda938c':
  docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
2015-03-18 19:07:53 +00:00
Craig Mautner
7b07f87440 am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
automerge: c5ee610

* commit 'c5ee610da5e3732e38e7e15d684c455eb6131279':
  Correct docs to specify leading slash in paths.
2015-03-18 19:07:44 +00:00
Nathan Harold
5fc29ed61a Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev
automerge: 8ee14a2

* commit '8ee14a244851ac80af0193541a5d521462d75e1e':
  Adding hidden isWifiCallingEnabled() and isVolteEnabled()
2015-03-18 19:07:35 +00:00
Vinit Deshpande
349868c105 Merge "Fix scan results to hold passpoint data" into m-wireless-dev 2015-03-18 18:43:35 +00:00
Erik Kline
d92bd99f65 Merge "Fix missing printf argument." into m-wireless-dev 2015-03-18 00:18:41 +00:00
Vinit Deshpande
2522c830a3 Fix scan results to hold passpoint data
Change-Id: I8ab75ec49226a59b04de6463de596cc9f5f6d800
2015-03-17 17:11:06 -07:00
Vinit Deshpande
9bd938a671 Merge "Improve passpoint configuration validation" into m-wireless-dev 2015-03-18 00:06:49 +00:00
Erik Kline
f5bd6a9719 Fix missing printf argument.
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
2015-03-18 08:41:42 +09:00
Pierre Vandwalle
7c39808331 Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev 2015-03-17 22:29:36 +00:00
Dong Zhou
bcb17eb7a9 am 89f41eb3: Define the capability to speed up MT call audio
* commit '89f41eb39e910e220957ac861651ead17eff9085':
  Define the capability to speed up MT call audio
2015-03-17 22:21:21 +00:00
Dong Zhou
89f41eb39e Define the capability to speed up MT call audio
Bug: 19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
2015-03-17 22:16:52 +00: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
Brian Carlstrom
6a6cf634f5 am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
  Update vmSafeMode documentation
2015-03-17 19:29:38 +00:00
Brian Carlstrom
97f3cd0a82 Merge "Update vmSafeMode documentation" into lmp-mr1-dev 2015-03-17 19:22:46 +00:00
Pavel Zhamaitsiak
1d33a37e05 Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev 2015-03-17 18:28:35 +00:00
Deepanshu Gupta
579535acfa am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming.
* commit '1f9a26af95abba385b612c734d1d5e32d9e3f363':
  Fix AppCompat action bar theming.
2015-03-17 14:28:36 +00:00
Deepanshu Gupta
cc5c1a57b0 am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
* commit '9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
  Fix NoActionBar themes rendering.
2015-03-17 14:28:32 +00:00
Deepanshu Gupta
1f9a26af95 am 158c08bc: am ada85905: Fix AppCompat action bar theming.
* commit '158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
  Fix AppCompat action bar theming.
2015-03-17 14:16:50 +00:00
Deepanshu Gupta
9a00f1c84b am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.
* commit '79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
  Fix NoActionBar themes rendering.
2015-03-17 14:16:42 +00:00
Lorenzo Colitti
3698af5f64 DHCP: Don't write options longer than 255 bytes.
Change-Id: Iddc971c7ac97253af3063850cde3dee10c3829ff
2015-03-17 19:56:34 +09:00
Lorenzo Colitti
2ed489f410 DHCP: parsing robustness fixes.
1. Check the length of the fixed-length portions of the packet.
2. Catch BufferUnderflowException while parsing options.

Change-Id: If907f49f02a04a4a3360f46a3192e94ab099af0e
2015-03-17 19:46:14 +09: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
a071edce46 DHCP: Add a Java DHCP client.
The behaviour of the client is intended to mirror the behaviour
of the current DhcpStateMachine + dhcpcd combination, except it
does not store leases across network changes.

Bug: 19704592
Change-Id: I110b58003da2d8293059d48a0181e16f7f7f145c
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
04b8d3aab6 DHCP: protocol changes.
1. Define and add parsing code for MTU, max message size, T1, T2.
2. Add common TLVs (message size, hostname, vendor ID) to all
   packets sent by the client.
3. Don't include requested IP and server ID in renew messages,
   since the RFC says MUST NOT.
4. Don't hardcode the broadcast flag to true in DISCOVER packets,
   use what the caller passed in.
5. Make some methods static.

Bug: 19704592
Change-Id: I42a0997e468b12e19cad9b403b98fe266e6cea73
2015-03-17 13:21:21 +09:00
Deepanshu Gupta
158c08bcf1 am ada85905: Fix AppCompat action bar theming.
* commit 'ada8590547348b77d8cbd56abdb8fadb3e72c015':
  Fix AppCompat action bar theming.
2015-03-17 00:21:02 +00:00
Deepanshu Gupta
79f7fce7a4 am 2e4d9324: Fix NoActionBar themes rendering.
* commit '2e4d93245764a1c1d7515361ddbb8fc1665f814e':
  Fix NoActionBar themes rendering.
2015-03-17 00:20:58 +00:00
Vinit Deshpande
04444427d0 Improve passpoint configuration validation
Change-Id: I717242b2f8b2e7d0f84c3a7c74c4672289387151
2015-03-16 14:07:55 -07:00
Deepanshu Gupta
ada8590547 Fix AppCompat action bar theming.
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.

 - Set project callback when LayoutInflater is created by
   LayoutInflater.from(context).
 - Remove duplication of code to get base context from context wrapper.

Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
2015-03-16 11:45:00 -07:00
Lorenzo Colitti
29cb944bef DHCP: glue code.
1. Add a method to make a DhcpResults object from a DHCP packet.
2. Add a method to fetch the client MAC from the packet. This is
   needed to check that the message is for us (lots of DHCP
   messages are broadcast).
3. Add a length argument to the method that parses DHCP packets,
   so the caller can use the same MTU-sized array all the time
   instead of having to pass in a new array for every packet.

Bug: 19704592
Change-Id: I58223f5ec90fb5c762bc2934649e02f9122018b2
2015-03-16 22:35:19 +09:00
Lorenzo Colitti
15204d50b4 DHCP: Ethernet/IP packet header changes.
1. Support L2_ENCAP when building packets as well as when parsing.
2. Skip IP options when parsing DHCP packets.

Bug: 19704592
Change-Id: Ic27a45790ed1cf7cf5b82d63b6c0b64c909a570f
2015-03-16 21:57:00 +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
c8a0f49fee DHCP: Minor cleanups to the packet code.
1. Delete the DhcpStateMachine, since we don't plan to use it.
2. Make all InetAddresses Inet4Addresses, since that's what they
   are.  In order to do this, define INADDR_ANY and
   INADDR_BROADCAST, constants, since Inet4Address.{ANY,ALL} are
   not Inet4Addresses but InetAddresses.

Bug: 19704592
Change-Id: I5a0499be889076992a60aaad0bd8be5ea66bd560
2015-03-16 20:08:47 +09: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
Deepanshu Gupta
2e4d932457 Fix NoActionBar themes rendering.
Also fix some warnings.

Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
2015-03-13 14:28:14 -07:00
Pierre Vandwalle
5914caff06 export API to disable autojoin scan initial implementation
Change-Id: I28e268dd8b859a3a22c3d6f699216bbd7124af26
2015-03-13 13:58:53 -07:00
Prerepa Viswanadham
e08a3977a0 Merge "Per controller tx/rx/idle current values - to be populated in device overlays" into m-wireless-dev 2015-03-13 20:05:43 +00:00