158620 Commits

Author SHA1 Message Date
Luan Nguyen
bff5c1932c am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
2014-10-15 19:12:18 +00:00
smain@google.com
b3994c2e58 am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page
* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
2014-10-15 19:12:05 +00:00
smain@google.com
2912627e00 am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906
* commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
  update analytics event tracking calls to use new script bug: 16331906
2014-10-15 19:11:43 +00:00
Jim Miller
839685bc57 am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
  Add a checkbox option to 'require password to decrypt'
2014-10-15 18:26:02 +00:00
Jim Miller
e7c325559d Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev 2014-10-15 18:21:52 +00:00
Amith Yamasani
54be1ea752 am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles
2014-10-15 17:48:50 +00:00
Amith Yamasani
2c3886cb34 Merge "Fix admin policies in managed profiles" into lmp-dev 2014-10-15 17:44:24 +00:00
Amith Yamasani
242f4b1259 Fix admin policies in managed profiles
Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.

Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.

Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.

Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.

Bug: 17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
2014-10-15 10:42:17 -07:00
John Spurlock
e5b42d97f6 Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Apps can end up in priority mode by setting ringer-mode = silent.

Now they can leave priority mode by setting ringer-mode = non-silent.
  (normal or vibrate)

Bug: 17884168
Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
2014-10-15 13:32:31 -04:00
Tom Taylor
48ed835468 Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Bug 17969135

Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.

Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
2014-10-15 10:20:17 -07:00
Chih-Hung Hsieh
60d53ebedb am 57622210: (-s ours) am e67bc0c9: (-s ours) Merge "Fix log call output format error. (DO NOT MERGE)"
* commit '57622210fb9c8f9af21b85e87e93b7081db9f99c':
  Fix log call output format error. (DO NOT MERGE)
2014-10-15 17:14:25 +00:00
Andrew Solovay
bab257453b Moved TV Input Framework (TIF) page out of preview.
See first comment on CL for the doc staging location. Setting up a
redirect for the old page with CL http://ag/566783

Change-Id: Ibd391cb3fe357495ecf3dc70b1edeadee12075f3
2014-10-15 10:10:11 -07:00
Chih-Hung Hsieh
57622210fb am e67bc0c9: (-s ours) Merge "Fix log call output format error. (DO NOT MERGE)"
* commit 'e67bc0c96733cee01e6f3027d9e6243f10ebbe40':
  Fix log call output format error. (DO NOT MERGE)
2014-10-15 17:09:03 +00:00
Chih-Hung Hsieh
e67bc0c967 Merge "Fix log call output format error. (DO NOT MERGE)" 2014-10-15 17:03:07 +00:00
Prashant Malani
645e017ca5 Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 2014-10-15 17:02:02 +00:00
Jeff Sharkey
96b46ebaee am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
  Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:53:28 +00:00
Jeff Sharkey
88a6ed5477 Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 2014-10-15 16:49:05 +00:00
Chih-Hung Hsieh
e07c9f140e Fix log call output format error. (DO NOT MERGE)
Cherry picked from googleplex-android c/445200.

BUG: 17916851
Change-Id: If4077e94d6dc7ef31ecf09cbcf41091c7e30268f
2014-10-15 16:48:22 +00:00
Tony Hill
ded6b4bf71 am 8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network
* commit '8e0297155075f9772dd6e8b8194da074dca008f8':
  Do not show roaming icon for BT Mobile SIM camped on EE UK network
2014-10-15 16:27:12 +00:00
Jeff Sharkey
97d47ed036 Reduce PackageInstaller Binder memory pressure.
When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions.  To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.

Bug: 17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
2014-10-15 09:19:54 -07:00
Lorenzo Colitti
ad4cd0c019 Allow root and system to bypass the always-on VPN firewall rules
This is needed to allow the always-on VPN to survive network
switches. In L, network switches are graceful, and in order to
switch to a network, the system first has to validate it using
DNS requests (from netd, running as root) and HTTP requests
(from NetworkMonitor, running inside the system_server).

This should also allow always-on VPN to work on networks like
T-Mobile that use 464xlat, fixing a bug that has been present
since K.

Bug: 9597277
Bug: 17695048
Change-Id: I0daa5707f2139339f9ececde0e73aac3bf23fdc3
2014-10-16 01:16:50 +09:00
Lorenzo Colitti
02c7abac85 Don't make lockdown VPN source firewall rules over-broad.
Currently, the lockdown VPN adds firewall allow rules matching
the whole subnet that the server assigned, so for example if
the VPN server assigns it the IP address 10.1.23.5/8, it will
allow the whole of 10.0.0.0/8 to pass the firewall.

This is needlessly overbroad and has a particularly bad corner
case where if the prefix length is 0, everything is allowed.

Bug: 17695048
Change-Id: Idbec4b3aea0f72f9bdfd26dcd72d6a97d026fb12
2014-10-16 01:16:50 +09:00
Lorenzo Colitti
0cb7903dde Propagate network state changes to the LockdownVpnTracker.
Bug: 17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3
2014-10-16 01:16:50 +09:00
Neil Fuller
12f427d0b5 am 1802567a: am e4625cc1: Merge "Fix Time docs to document various error cases"
* commit '1802567a79b2fc94aa1dff387cd55db8521cdca6':
  Fix Time docs to document various error cases
2014-10-15 16:05:56 +00:00
Neil Fuller
1802567a79 am e4625cc1: Merge "Fix Time docs to document various error cases"
* commit 'e4625cc1a861615f4b3447e2a4d4990590d51470':
  Fix Time docs to document various error cases
2014-10-15 16:01:01 +00:00
Neil Fuller
e4625cc1a8 Merge "Fix Time docs to document various error cases" 2014-10-15 15:56:06 +00:00
Ricardo Cervera
dc1f308048 am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs
* commit '8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
  docs: Fixing notify link. Bug: 17571861
2014-10-15 15:50:42 +00:00
Ricardo Cervera
8a7ba4c681 Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 2014-10-15 15:47:31 +00:00
Luan Nguyen
c07a288a88 am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit '2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
  docs: Android Wear Design fixes
2014-10-15 15:17:40 +00:00
Luan Nguyen
2a364235d2 Merge "docs: Android Wear Design fixes" into klp-modular-docs 2014-10-15 15:12:24 +00:00
Tony Hill
8e02971550 Do not show roaming icon for BT Mobile SIM camped on EE UK network
Bug: 17986042
Change-Id: Ia9802c12363bbe6e93cf0b2e524351b6a3f4871c
2014-10-15 08:03:03 -07:00
Neil Fuller
7079f2003c Fix Time docs to document various error cases
Bug: https://code.google.com/p/android/issues/detail?id=76386
Change-Id: Ibb71405b70453d5abaf45426ec4e36261b6695cf
2014-10-15 12:08:05 +01:00
Neil Fuller
32b88b48da Replacing FloatMath native implementation with calls to Math
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I8d1947d88b3c576643138b1df589fb9da7c1ab88
2014-10-15 11:47:58 +01:00
Narayan Kamath
8091edbffb Set threads' contextClassLoader during LoadedApk.makeApplication.
We used to set this from LoadedApk.getClassLoader. This had
the unfortunate side effect of clobbering the threads default
classloader when Context.createPackageContext().getClassLoader()
was called. This happens, for example, to every app that uses
a updatable webview.

bug: 17986934
Change-Id: If2b5938a19f836ea5fe60c94ea53a7125c2098c0
2014-10-15 11:38:44 +01:00
Jinsuk Kim
c38402158b am 5873c3e8: Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev
* commit '5873c3e862b83fb0c64b52b86bdd8f26ff8ffb5f':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
2014-10-15 05:15:13 +00:00
Jinsuk Kim
5873c3e862 Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev 2014-10-15 05:11:00 +00:00
smain@google.com
e43bb6a9ec am 075531ae: add the butterbar for L announce to Preview landing page
* commit '075531ae190dd6e64d3a53991a209a624cb0ec63':
  add the butterbar for L announce to Preview landing page
2014-10-15 03:36:11 +00:00
smain@google.com
075531ae19 add the butterbar for L announce to Preview landing page
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
2014-10-14 19:39:11 -07:00
smain@google.com
6fbe299fa5 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906
* commit 'd8d20f52ec0550477b773cee4c0f0343f2a9301f':
  update analytics event tracking calls to use new script bug: 16331906
2014-10-15 02:15:35 +00:00
smain@google.com
d8d20f52ec update analytics event tracking calls to use new script
bug: 16331906

Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
2014-10-14 19:03:08 -07:00
Jeff Sharkey
40a13df16f am 97978808: Start cross profile intents as caller.
* commit '9797880808320e3a7bae1f59bc7e0c5a13189e5f':
  Start cross profile intents as caller.
2014-10-15 01:59:18 +00:00
Craig Mautner
1559d9d15f DO NOT MERGE Add empty ArrayList check.
Fixes bug 15768779.
Fixes bug 17955259.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
2014-10-15 01:30:10 +00:00
Jeff Sharkey
9797880808 Start cross profile intents as caller.
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
2014-10-14 17:57:28 -07:00
Svetoslav
2f5095ea4f am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev
* commit 'dc876b56217c588596661ca514b4bdb8a6cfe843':
  Fix a NPE in device policy manager service.
2014-10-15 00:07:22 +00:00
Svetoslav
dc876b5621 Merge "Fix a NPE in device policy manager service." into lmp-dev 2014-10-15 00:02:59 +00:00
Jinsuk Kim
eaab72ac41 DO NOT MERGE CEC: Queue actions for starting later when not ready
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17985588
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7

Conflicts:
	services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
2014-10-14 23:49:57 +00:00
Craig Mautner
fcd90ffcae am ea496644: Merge "Add null check" into lmp-dev
* commit 'ea4966442cd035e592aa73c0c29225efe3f091fb':
  Add null check
2014-10-14 23:41:12 +00:00
Craig Mautner
ea4966442c Merge "Add null check" into lmp-dev 2014-10-14 23:35:35 +00:00
Jim Miller
6848dc8e3b Add a checkbox option to 'require password to decrypt'
Fixes bug 17881324

Change-Id: Id94e593a172d686339c736473226fece1bb749ee
2014-10-14 16:26:11 -07:00
Craig Mautner
29c58cad4e Add null check
Unable to examine bugreports that die in the middle of dump().

Help for bug 17721767.

Change-Id: I31a5e03acf67c926a1cbfefe2a7ea7fca3b71b06
2014-10-14 16:17:06 -07:00