67267 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
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
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
d41ca0fe75 Add a protectFromVpn method that takes a FileDescriptor
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
2015-03-20 16:32:40 +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
Vladislav Kaznacheev
fca29e7d49 Merge "Start respecting View.DRAG_FLAG_GLOBAL flag." 2015-03-20 00:15:43 +00:00
Chris Craik
49911ce732 Merge "Avoid throwing ISE in Canvas#restore underflow" 2015-03-19 23:29:58 +00:00
Dianne Hackborn
79ec42e6a3 Merge "First stab at device idle mode." 2015-03-19 23:05:16 +00:00
Bo Liu
4dd12ef0c5 Merge "Remove debug logging from WebView" 2015-03-19 22:28:03 +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
Bo Liu
17a7989904 Remove debug logging from WebView
Moving them to chromium:
https://codereview.chromium.org/1022993002/

Change-Id: I6a9294b7041e9768397a624e5c174b22f4085e87
2015-03-19 14:19:29 -07:00
Guang Zhu
8d09a7445e Merge "pass stream contents in separate thread for executeShellCommand" 2015-03-19 21:14:15 +00:00
Dianne Hackborn
8ad2af7e5b First stab at device idle mode.
Introduce a new device idle controller service that
monitor's the device state and determines when to go
in to idle mode.  When in idle mode, all we do right
now is turn off network access the same as we do for
power save mode.  Many more things should come in the
future -- stopping the alarm manager from scheduling
(most) alarms, telling GmsCore for it to stop doing
stuff, etc.

Battery stats now has state tracking for devie idle
mode, as well as events for the reasons we can come
out of idle mode (significant motion or the device
becoming active).  Also added new events noting when
packages are installed.

Renamed the "low power" event in battery stats to
"power save" because the former was just way too
confusing.

Finally, fix buffer size reading kernel wake locks.
(Stupidly, just increasing the buffer size.  Ideally
we should try to be smarter and grow our buffer to
fit the data available, but I'll leave that for
another time.)

Change-Id: I0be2062466c83ee9d890c6cf5a228d9cc4090eca
2015-03-19 11:10:55 -07:00
Yin-Chia Yeh
3816e4a73a Merge "Camera: update createStream API to add new rotation field" 2015-03-19 17:27:39 +00:00
Mathieu Chartier
543a3578ad am 05844d57: am b7d997a7: Merge "Revert "Change jit properties to be debug properties""
* commit '05844d573f33c77cd7bb608a118a998506a6996d':
  Revert "Change jit properties to be debug properties"
2015-03-19 17:06:43 +00:00
Mathieu Chartier
05844d573f am b7d997a7: Merge "Revert "Change jit properties to be debug properties""
* commit 'b7d997a7b79c233869fdd5ad18b013caad4a7236':
  Revert "Change jit properties to be debug properties"
2015-03-19 16:58:59 +00:00
Mathieu Chartier
b7d997a7b7 Merge "Revert "Change jit properties to be debug properties"" 2015-03-19 16:44:59 +00:00
Alex Klyubin
160a253d48 am d71f548f: am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."
* commit 'd71f548f4803f0696af7de9a2989673cfd83800f':
  Add app-level usesCleartextTraffic manifest attribute.
2015-03-19 16:43:52 +00:00
Alex Klyubin
d71f548f48 am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."
* commit '4177b8cbbfa239d68a9283124638d9399a5dd0de':
  Add app-level usesCleartextTraffic manifest attribute.
2015-03-19 16:21:40 +00:00
Alex Klyubin
4177b8cbbf Merge "Add app-level usesCleartextTraffic manifest attribute." 2015-03-19 16:10:20 +00:00
Vinod Krishnan
ed7cfb67e7 am 7a2df74b: am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
* commit '7a2df74b1124746fa5400d3ed5e6e3680c8f3601':
  Make Theme.Micro point to Theme.Material
2015-03-19 09:48:03 +00:00
Vinod Krishnan
7a2df74b11 am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
* commit '3f782ad156d337c7c6c542696ddc67ae82fa7a84':
  Make Theme.Micro point to Theme.Material
2015-03-19 09:42:46 +00:00
Vinod Krishnan
3f782ad156 Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev 2015-03-19 09:36:37 +00:00
Benjamin Franz
bff46bac80 Add DO policy to disable safe boot mode.
Bug: 19615843
Change-Id: I14dbe911995ec216c57bd285d6b7b04c9684591a
2015-03-19 09:19:18 +00:00
Guang Zhu
14e260125e pass stream contents in separate thread for executeShellCommand
Doing it in binder thread will cause deadlock if stdout of
process under execution is larger than buffer of
java.lang.Runtime#exec(String).

Bug: 19829679
Change-Id: Icf0fccd3e2e80b0db4cc1115e501f79066adf091
2015-03-18 20:54:46 -07:00
Mathieu Chartier
1fb7aab9b2 Revert "Change jit properties to be debug properties"
Bug: 19735273

This reverts commit 1ad10ef1e4b83ef9e845761a82e202bb57e2379d.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
2015-03-18 19:07:02 -07:00
Alan Viverette
eef3bcbbe4 Merge "Replace usages of deprecated Resources.getColor() and getColorStateList()" 2015-03-19 01:54:09 +00:00
Alan Viverette
4a357cd2e5 Replace usages of deprecated Resources.getColor() and getColorStateList()
Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0
2015-03-18 18:37:18 -07:00
Shawn Willden
29a5a5b654 am 1bed39a5: am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."
* commit '1bed39a5e4d57e4735e72a1e9765dcec62035b40':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
2015-03-19 00:48:02 +00:00
Shawn Willden
98be580dbb am 615f39f9: am 254c58c4: Merge changes Id9a22ad3,I629ab2c4
* commit '615f39f911cdc4201b4e1c63c79ae1819a6645ea':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:47:54 +00:00
Shawn Willden
1bed39a5e4 am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."
* commit 'e921b8a28f0d5b69fbb30374241c62fa90e92013':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
2015-03-19 00:42:09 +00:00
Shawn Willden
615f39f911 am 254c58c4: Merge changes Id9a22ad3,I629ab2c4
* commit '254c58c4e760e0af132d680fbd783a38ef436435':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:41:58 +00:00
Bryce Lee
d8379b907f am 8b8a0451: am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
* commit '8b8a045133e0466e964b4094269585708805b90a':
  Add Assist global action for wear to different from VOICE_ASSIST
2015-03-19 00:32:17 +00:00
Shawn Willden
e90774ddbc Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
Also change to an ENUM, to match changes in keymaster_defs.h

Change-Id: Ieda3402563b0b9e4e8b100eb69a94651e51c6347
2015-03-18 18:28:39 -06:00
Shawn Willden
254c58c4e7 Merge changes Id9a22ad3,I629ab2c4
* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
2015-03-19 00:27:38 +00:00
Bryce Lee
8b8a045133 am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
* commit '8bc23e82af040334af4f2af1dae9898cc8c66df8':
  Add Assist global action for wear to different from VOICE_ASSIST
2015-03-19 00:21:13 +00:00
Bryce Lee
8bc23e82af Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 2015-03-19 00:14:07 +00:00
Clara Bayarri
6820434edd Merge "Editor: Avoid the paste popup from coming up when a word is selected." 2015-03-19 00:04:37 +00:00
Mathieu Chartier
75f1ba5a81 am f792e016: am 437ac8f8: Merge "Add JIT late override property"
* commit 'f792e01606b988ab84190217529cca53da8db3f5':
  Add JIT late override property
2015-03-18 23:51:12 +00:00
Andreas Gampe
27f2fe5c1a am b078ff16: am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
* commit 'b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6':
  Frameworks/base: Fix potential NPE in InputMethod
2015-03-18 23:50:54 +00:00
Andreas Gampe
870c4ba78a am 1eca7d66: am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"
* commit '1eca7d66ee3da87c622259544794b8fe998cdb92':
  Frameworks/base: Fix visibility flag in Editor
2015-03-18 23:50:35 +00:00
Vladislav Kaznacheev
c3debf29d6 Start respecting View.DRAG_FLAG_GLOBAL flag.
Respect flags passed to startDrag (they used to be ignored).
Allow global drag&drop for text views.

Bug: 19548858
Change-Id: I981cfd617ebc6f5f2d59ebded798c22dc4920d38
2015-03-18 16:32:21 -07:00
Mathieu Chartier
f792e01606 am 437ac8f8: Merge "Add JIT late override property"
* commit '437ac8f8445b078041171eff56ce7ffbd1cf6766':
  Add JIT late override property
2015-03-18 23:09:21 +00:00