Commit Graph

46224 Commits

Author SHA1 Message Date
Alan Viverette
835d798606 Docs nit
Change-Id: I390997826db6997f843cafc4136633937e185e82
2015-03-23 14:54:35 -07:00
Alan Viverette
167fa2fdb7 Merge "Clean up date picker" 2015-03-23 21:36:08 +00:00
Alan Viverette
452fe34984 Clean up date picker
Bug: 19758502
Change-Id: I11ed62245d15d155335f5652000b9dc81185e2f9
2015-03-23 14:26:09 -07:00
Jay Shrauner
a6baa77482 Merge "Check for empty lookup keys in getLookupUri" 2015-03-23 21:03:33 +00:00
Jeff Brown
04bf45a300 Merge "resolved conflicts for merge of 13d81b6d to master" 2015-03-23 21:02:30 +00:00
Julia Reynolds
151df5db5f Merge "DPM constants for specifying minimum version numbers for DO and DIA." 2015-03-23 21:01:30 +00:00
Alan Viverette
53796737eb Merge "Fix default width and height for PopupWindow's decor view" 2015-03-23 20:54:43 +00:00
Jeff Brown
221a8277dc resolved conflicts for merge of 13d81b6d to master
Change-Id: Icb72123fcf4b74e97d9a62504caf8a17eb65c9e6
2015-03-23 13:53:09 -07:00
Alan Viverette
29abdb429c Merge "Correctly apply android:theme attribute from <include> tag" 2015-03-23 20:50:54 +00:00
Alan Viverette
0ef59ac0e5 Update DatePicker and CalendarView to latest Material spec
Bug: 19431364
Change-Id: If364a051a5208d170495de4182e46b32c7560e08
2015-03-23 13:13:25 -07:00
Alan Viverette
2a16460c7c Merge "Fix radial time picker for Explore by Touch and scroll actions" 2015-03-23 17:35:40 +00:00
Alan Viverette
4a6bd692d2 Fix radial time picker for Explore by Touch and scroll actions
Bug: 19889521
Change-Id: I4fa6b9e0459630ecdb4144f4640213415247735a
2015-03-23 10:34:23 -07:00
Alan Viverette
259c284069 Fix default width and height for PopupWindow's decor view
Fixes a regression whereby failing to explicitly set a width and height
would cause the popup window's decor view to be 0 width and height.

Also deprecates unnecessary method for setting window width and
height spec and replaces with less-confusing setters.

Cleans up javadoc for modified methods.

Bug: 19538371
Change-Id: I20da3ff02ad12e99adf14c056edd1a890b5c322a
2015-03-22 17:39:39 -07:00
Jeff Sharkey
bf2673384c Merge "Bring MountService into the SystemService world." 2015-03-22 20:03:55 +00:00
Jeff Sharkey
56e629322f Bring MountService into the SystemService world.
Change-Id: I7f7db49ff373b199f7b81f184a7c62bee682af67
2015-03-21 20:41:00 -07:00
Alex Klyubin
afa10ad39a am 2110a28a: am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
* commit '2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1':
  Add android.security.NetworkSecurityPolicy.
2015-03-22 00:40:51 +00:00
Ruben Brunk
2c2546a296 camera2: Remove ProCamera.
Bug: 19186859
Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
2015-03-20 22:38:54 -07:00
Alan Viverette
6194d728cf Correctly apply android:theme attribute from <include> tag
Bug: 19865544
Change-Id: I6b50fa9f28a9d7f1685f9f55e505c630c12c53a2
2015-03-20 15:49:06 -07:00
Casey Ho
3daef246bd Merge "Javadoc for ACTION_SCREEN_<ON|OFF> to indicate they cannot be registered in the manifest." 2015-03-20 21:05:04 +00:00
John Spurlock
606f1c9c9d Merge "HUN: Implement per-package config." 2015-03-20 20:20:09 +00:00
Tim Kilbourn
a81c231d31 Merge "Add unique id to InputDevice." 2015-03-20 18:46:20 +00:00
Tim Kilbourn
415b450bf2 Add unique id to InputDevice.
If an input device driver assigns unique ids to devices (e.g., MAC
address), this method will be used to retrieve it from the device.

Change-Id: If1fd6643c5be7af5b989ef47f4bb653e7a63b6c6
2015-03-20 11:43:12 -07:00
Alex Klyubin
2110a28a6c am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
* commit 'a4c4c575c793d3ba4847107b15ce3a9dd5395878':
  Add android.security.NetworkSecurityPolicy.
2015-03-20 18:08:30 +00:00
Julia Reynolds
c173174a20 DPM constants for specifying minimum version numbers for DO and DIA.
Bug: 19859261
Change-Id: Id2730dc33d433e21f3afab4f0c31c3371f368afc
2015-03-20 08:50:53 -04: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
John Spurlock
1d881a1e98 HUN: Implement per-package config.
- Keep track of whether or not HUNs are allowed per-package.
- No impact on ranking, purely presentational.
- Simplify RankingHelper with a package table.
- Improve RankingHelper dump.
- Fix some warnings and typos.

Bug: 19776495
Change-Id: I28d69df69b576f4eabbb528eabecb1f736f0e830
2015-03-20 00:04:11 -04: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
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
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
Alex Klyubin
f9034cc4ae Add android.security.NetworkSecurityPolicy.
The initial purpose of the NetworkSecurityPolicy class is to provide a
way for network libraries to check whether cleartext network traffic
(e.g., HTTP, WebSockets, XMPP, IMAP, SMTP) should be blocked from this
process.

The policy is set declaratively by the app developer in the app's
manifest and can be queried from ApplicationInfo.flags. Unfortunately,
several network stacks (bundled and unbundled) do not have a reference
to ApplicationInfo or Context.

Alternatives:
* Keep this API hidden (and thus potentially move it from framework to
  libcore), thus precluding unbundled HTTP stacks from using the API.
* Introduce a new java.lang.System property instead of this API.
  However, such properties are a mess and not as powerful/extensible
  as a public class.

Bug: 19215516
Change-Id: If22056a74d257bf1d805ebb4fc284240b3d338f1
2015-03-19 10:27:48 -07:00
Yin-Chia Yeh
3816e4a73a Merge "Camera: update createStream API to add new rotation field" 2015-03-19 17:27:39 +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
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
Casey Ho
dbf6785c67 Javadoc for ACTION_SCREEN_<ON|OFF> to indicate they cannot be registered in the manifest.
Change-Id: Ic97a36498628f7f249b6776df455e01aaa995ae4
2015-03-18 20:02:25 -07:00
Alan Viverette
eef3bcbbe4 Merge "Replace usages of deprecated Resources.getColor() and getColorStateList()" 2015-03-19 01:54:09 +00:00