154247 Commits

Author SHA1 Message Date
Tom Taylor
522fe28e3d am 6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev
* commit '6d4f4575463ef5fdcdfbf3118a893ecbdb14a02b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-10-15 23:15:26 +00:00
Prashant Malani
0227cebcb2 am c64522fb: am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
* commit 'c64522fb2e1893c21b1b1cc9051a3d1013c5d987':
  DO NOT MERGE Add empty ArrayList check.
2014-10-15 23:14:27 +00:00
Ricardo Cervera
e0cf20b505 am 7e50d970: am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs
* commit '7e50d9706cd0d7cd5c58c976fd582c81478a975c':
  docs: Fixing notify link. Bug: 17571861
2014-10-15 23:14:24 +00:00
Luan Nguyen
faea1ffab2 am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit 'bff5c1932c6bdd2a777b4236f9f1d562a53029fb':
  docs: Android Wear Design fixes
2014-10-15 23:14:17 +00:00
smain@google.com
fcebd6c320 am b3994c2e: am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page
* commit 'b3994c2e58c7cebef8274ff6d801819a2b189183':
  add the butterbar for L announce to Preview landing page
2014-10-15 23:14:12 +00:00
smain@google.com
24ff6491f1 am 2912627e: am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906
* commit '2912627e007b95cf4b16c9e52a3acbec0c8bae60':
  update analytics event tracking calls to use new script bug: 16331906
2014-10-15 23:14:07 +00:00
Dirk Dougherty
8ca0f84ea3 Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 2014-10-15 22:40:19 +00:00
Geoff Mendal
7b5d78f890 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-15 22:38:39 +00:00
Marco Nelissen
c1fda12823 Also consider secondary storage when verifying paths
Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
2014-10-15 15:36:50 -07:00
Geoff Mendal
90a1bd0769 Import translations. DO NOT MERGE
Change-Id: I77f88b9cd7716f3dc5e432f943d015860018858a
Auto-generated-cl: translation import
2014-10-15 15:19:49 -07:00
Dirk Dougherty
6034230b29 Doc change: Add diffs for API level 21.
Change-Id: I6efad4bb407dbfc7684a5651788e116d624e778e
2014-10-15 15:06:50 -07:00
Dirk Dougherty
963dca1a5d Doc change: Add diffs for l-preview -> API level 21.
Change-Id: Ie60fbe9ed5891dd87fd9ca53f126c4617e09d3bd
2014-10-15 14:59:15 -07:00
Geoff Mendal
e2a1f1cd88 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-15 21:52:24 +00:00
Craig Mautner
5d460b8871 Merge "Remove unnecessary logging." into lmp-dev 2014-10-15 21:48:52 +00:00
Geoff Mendal
89b5580b81 Import translations. DO NOT MERGE
Change-Id: I5fc63b0e1cf68a8b5f17b46308abebaba76ce81c
Auto-generated-cl: translation import
2014-10-15 14:37:19 -07:00
Eric Rowe
1b4a728ac6 Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 2014-10-15 21:35:32 +00:00
Craig Mautner
3d7485c172 Remove unnecessary logging.
Change-Id: Ia5b5325707f2f02f2c585130938565065e974938
2014-10-15 14:30:02 -07:00
Craig Mautner
e52791055c Merge "Move desired task to top if not already there." into lmp-dev 2014-10-15 21:13:58 +00:00
Craig Mautner
737fae2b2e Move desired task to top if not already there.
Under certain circumstances when launching a new activity, the
topmost stack activity is moved to the front even though the
activity is being created in a different task.

This checks if the topmost stack task matches the desired
task and if not, moves the desired task to the top.

Also make activity dump ordering consistent.

Fixes bug 17721767.

Change-Id: I59397f31b629a208f3863887c57d6f6fb1f6e1f3
2014-10-15 14:11:23 -07:00
Eric Rowe
500f7583ed Add CHANGE_NETWORK_STATE permission to bt tests
Change-Id: Ie0a579de3b7d1163a8fe245eb377f21eeed048a3
2014-10-15 14:06:30 -07:00
John Spurlock
b2344c81bc Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 2014-10-15 21:04:33 +00:00
Evan Charlton
843e234318 Add WindowManager.aidl to AIDL list
WindowManager.aidl has an inner class (WindowManager.LayoutParams)
which needs to be included, but slipped past the api/current.txt grep.

This affects the SDK only

Change-Id: I71bea4e602428ab588d17c5e57cbe08a1d6e9493
2014-10-15 13:26:32 -07:00
Quddus Chong
ccd80045a3 docs: Added L API overview.
Change-Id: Idd042b41a99f61faa6b011c2900210ed38b017b9
2014-10-15 13:25:55 -07:00
Jim Miller
3836c9a4c1 Fix getStorageEncryptionStatus() in DevicePolicyManager
This fixes a bug introduced by a change where the function
ignores systems with default encryption where it's disabled.

The fix also checks to see if vold thinks the device is secure.

Fixes bug 17881324

Change-Id: I2c40f76cf990d90d1a825955aa3b080b21684426
2014-10-15 13:15:52 -07:00
RoboErik
c7be69f1d6 Merge "Don't call size on a null metadata" into lmp-dev 2014-10-15 19:48:50 +00:00
Tom Taylor
6d4f457546 Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 2014-10-15 19:20:36 +00:00
RoboErik
421c9df7ff Don't call size on a null metadata
bug:18002951
Change-Id: I3a2d2c781e7b235efbd8518d60eee7f44bbacd75
2014-10-15 12:17:43 -07:00
Prashant Malani
c64522fb2e am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
* commit '645e017ca54e654c34b131235e90589a7d92ce0c':
  DO NOT MERGE Add empty ArrayList check.
2014-10-15 19:12:33 +00:00
Ricardo Cervera
7e50d9706c am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs
* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
2014-10-15 19:12:26 +00:00
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
Nancy Chen
9faf13b474 Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 2014-10-15 18:47:03 +00:00
Jim Miller
09ba0da87f 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:59 +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
Vince Harron
1c9cff294a Updated Android SDK/Studio system requirements
We're not really supporting ancient Linux/OSX systems, we should
update the website to accurately reflect this.

Change-Id: Id05df4c4e2a4235d325e099a1f29fb7cbe749675
2014-10-15 10:57:19 -07:00
Amith Yamasani
01ddc75fc1 am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles
2014-10-15 17:49:19 +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
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
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
203ed4db96 am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
  Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:53:09 +00:00
Jeff Sharkey
88a6ed5477 Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 2014-10-15 16:49:05 +00:00
Tony Hill
a5380d9664 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:28 +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