185609 Commits

Author SHA1 Message Date
Adam Lesinski
39fa40cbad Merge "Disable WiFi energy data collection to avoid deadlock" 2015-03-20 18:07:24 +00:00
Winson Chung
a92c07809c Merge "Fixing issue with screen-pinning for secondary users." 2015-03-20 16:59:59 +00:00
Rubin Xu
ec32b56cc2 Add DelegatedCertInstaller API in DPMS
Allow device/profile owner to delegate certificate APIs to third-party
certificate installer apps.

Bug: 19551274
Change-Id: Iaf9abb5ecb1dc0975fa98ea14408fe392d52fbf4
2015-03-20 10:11:29 +00:00
Lorenzo Colitti
f2104b11a8 Merge changes Iddc971c7,If907f49f,I5505bd2c,I110b5800,I9aeb29c2, ...
* changes:
  DHCP: Don't write options longer than 255 bytes.
  DHCP: parsing robustness fixes.
  DHCP: Add a hidden setting to use the legacy DHCP client.
  DHCP: Add a Java DHCP client.
  Add a protectFromVpn method that takes a FileDescriptor
  DHCP: protocol changes.
  DHCP: glue code.
  DHCP: Ethernet/IP packet header 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.
  Add two utility methods for IPv4 netmasks.
2015-03-20 08:29:26 +00:00
Lorenzo Colitti
06ac4b8dd1 DHCP: Don't write options longer than 255 bytes.
Change-Id: Iddc971c7ac97253af3063850cde3dee10c3829ff
2015-03-20 16:32:44 +09:00
Lorenzo Colitti
b05c9234e6 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-20 16:32:43 +09:00
Lorenzo Colitti
06d7e5301d DHCP: Add a hidden setting to use the legacy DHCP client.
Change-Id: I5505bd2c20ddc895df0e9b176e1ed770ad74a3f4
2015-03-20 16:32:42 +09:00
Lorenzo Colitti
e7d4243be9 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-20 16:32:41 +09:00
Lorenzo Colitti
d41ca0fe75 Add a protectFromVpn method that takes a FileDescriptor
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
2015-03-20 16:32:40 +09:00
Lorenzo Colitti
fe5ffce09c 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-20 16:32:39 +09:00
Lorenzo Colitti
86bff86778 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-20 16:32:39 +09:00
Lorenzo Colitti
7f7cc61159 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-20 16:32:38 +09:00
Lorenzo Colitti
51697effe9 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-20 16:32:37 +09:00
Lorenzo Colitti
eca9b9bd8b 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-20 16:32:36 +09:00
Lorenzo Colitti
cbe4f7c225 DHCP: Add a native method for making a DHCP socket.
Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be
2015-03-20 16:32:35 +09:00
Lorenzo Colitti
c4795d858d 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-20 16:32:35 +09:00
Lorenzo Colitti
e5ef28f509 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-20 16:32:34 +09:00
Jinsuk Kim
e37628c031 Merge "CEC: Expose API sendStandby()" 2015-03-20 04:28:18 +00:00
Adam Lesinski
cb204c3334 Disable WiFi energy data collection to avoid deadlock
This is a temporary fix to prevent deadlocking in the
system. Need to come up with a better solution for
accessing WiFi and other subsystems from BatteryStats.

b/19729960

Change-Id: I464e7490c9780249d2a3eef05ce084a7d84372c0
2015-03-19 18:11:25 -07:00
Jinsuk Kim
8d115eb18f CEC: Expose API sendStandby()
Allows playback/TV device to use the API to turn off
TV/other device that accepts the command.

Bug: 19802768
Change-Id: I6440626c08efb1473bea5ab577e571d0bb92d4a1
2015-03-20 10:02:34 +09:00
Phil Burk
9b58c85524 Merge "AudioService: fix String cast crash when mediaserver killed" 2015-03-20 00:28:30 +00:00
Vladislav Kaznacheev
fca29e7d49 Merge "Start respecting View.DRAG_FLAG_GLOBAL flag." 2015-03-20 00:15:43 +00:00
Phil Burk
1a7700793d AudioService: fix String cast crash when mediaserver killed
Bug: 19847028
Change-Id: I45668fbd08e87df69fe3867473a09c387589ca8a
Signed-off-by: Phil Burk <philburk@google.com>
2015-03-19 17:01:16 -07:00
Zach Riggle
3a96f767c3 am 685d33dd: am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '685d33dd18aba2c9ceb7586a638ec7850c1872a7':
  Fix NPE in FlashlightController
2015-03-19 23:50:59 +00:00
Zach Riggle
685d33dd18 am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '104a29b6b5fe6e454787053ca72950dbbc4d424b':
  Fix NPE in FlashlightController
2015-03-19 23:42:58 +00:00
Yang Ni
4778caae50 am 53699ec6: am d3e6428a: Merge "New API methods for Script Group"
* commit '53699ec613acf76277b69db57bf2f378d0dc374a':
  New API methods for Script Group
2015-03-19 23:42:34 +00:00
Zach Riggle
104a29b6b5 am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit 'a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
  Fix NPE in FlashlightController
2015-03-19 23:35:20 +00:00
Yang Ni
53699ec613 am d3e6428a: Merge "New API methods for Script Group"
* commit 'd3e6428aea34ce3297123c63b4dd6223dac5d5a8':
  New API methods for Script Group
2015-03-19 23:35:14 +00:00
Craig Mautner
efadd572b9 Merge "Fix bad nesting count when remote calls fail." 2015-03-19 23:31:52 +00:00
Chris Craik
49911ce732 Merge "Avoid throwing ISE in Canvas#restore underflow" 2015-03-19 23:29:58 +00:00
Zach Riggle
a7dbe970bc am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
  Fix NPE in FlashlightController
2015-03-19 23:29:06 +00:00
smain@google.com
0a74aac1ef am 62c595aa: am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '62c595aaee29d88c7ae0694f8aeb83179f33150c':
  add Places API to the Location feature page
2015-03-19 23:27:14 +00:00
Zach Riggle
901e400826 am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController
2015-03-19 23:22:10 +00:00
Yang Ni
d3e6428aea Merge "New API methods for Script Group" 2015-03-19 23:21:28 +00:00
Zach Riggle
a6e7a9b50d am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController
2015-03-19 23:15:02 +00:00
Zach Riggle
6a5b2110eb Merge "Fix NPE in FlashlightController" into lmp-dev 2015-03-19 23:09:33 +00:00
Dianne Hackborn
79ec42e6a3 Merge "First stab at device idle mode." 2015-03-19 23:05:16 +00:00
smain@google.com
62c595aaee am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '6784cf9945e01de63f67ed11a4925fa9879f2073':
  add Places API to the Location feature page
2015-03-19 22:55:38 +00:00
smain@google.com
6784cf9945 am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '092a7893779455ca9d1a0ff34d9ccefb9ae709db':
  add Places API to the Location feature page
2015-03-19 22:48:07 +00:00
smain@google.com
092a789377 am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page
2015-03-19 22:42:44 +00:00
smain@google.com
d5fdc28700 am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page
2015-03-19 22:35:16 +00:00
smain@google.com
3bc84b18b7 am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page
2015-03-19 22:29:09 +00:00
Bo Liu
4dd12ef0c5 Merge "Remove debug logging from WebView" 2015-03-19 22:28:03 +00:00
smain@google.com
910ca41558 am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page
2015-03-19 22:22:10 +00:00
smain@google.com
4b53dc8bae Merge "add Places API to the Location feature page" into lmp-docs 2015-03-19 22:16:12 +00:00
Chris Craik
14cfb6db33 Avoid throwing ISE in Canvas#restore underflow
bug:19829784

Change-Id: I5829a7783ad912c09c83dee17bad10b90f42aace
2015-03-19 15:11:38 -07:00
Paul Mclean
3756b40992 Merge "AudioService: fix crash when mediaserver killed" 2015-03-19 22:02:42 +00:00
Phil Burk
413d307c2c AudioService: fix crash when mediaserver killed
Bug: 19847028
Change-Id: I4acacd8a6d20317d180a6994158abc0b2957280c
Signed-off-by: Phil Burk <philburk@google.com>
2015-03-19 14:59:20 -07:00
Yang Ni
c6dbfececd am f2ea0171: am c077ee31: Merge "Added copyright notice and formatted to convention"
* commit 'f2ea01717b918471b050bea46529e1843d36fc84':
  Added copyright notice and formatted to convention
2015-03-19 21:47:31 +00:00
Yang Ni
f2ea01717b am c077ee31: Merge "Added copyright notice and formatted to convention"
* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
  Added copyright notice and formatted to convention
2015-03-19 21:41:59 +00:00