3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 28 Apr 2016 07:03:45 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 27 Apr 2016 02:50:03 +0000]
Import translations. DO NOT MERGE

Change-Id: Ic740947008131405afb202b6217b12d178896888
Auto-generated-cl: translation import

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 26 Apr 2016 07:04:01 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoMove DownloadManager to use JobScheduler.
Jeff Sharkey [Thu, 21 Apr 2016 05:23:09 +0000]
Move DownloadManager to use JobScheduler.

JobScheduler is in a much better position to coordinate tasks across
the platform to optimize battery and RAM usage.  This change removes
a bunch of manual scheduling logic by representing each download as
a separate job with relevant scheduling constraints.  Requested
network types, retry backoff timing, and newly added charging and
idle constraints are plumbed through as job parameters.

When a job times out, we halt the download and schedule it to resume
later.  The majority of downloads should have ETag values to enable
resuming like this.

Remove local wakelocks, since the platform now acquires and blames
our jobs on the requesting app.

When an active download is pushing updates to the database, check for
both paused and cancelled state to quickly halt an ongoing download.

Shift DownloadNotifier to update directly based on a Cursor, since we
no longer have the overhead of fully-parsed DownloadInfo objects.

Unify a handful of worker threads into a single shared thread.

Remove legacy "large download" activity that was thrown in the face
of the user; the UX best-practice is to go through notification, and
update that dialog to let the user override and continue if under
the hard limit.

Bug: 28098882, 26571724
Change-Id: I33ebe59b3c2ea9c89ec526f70b1950c734abc4a7

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 21 Apr 2016 07:03:53 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoMerge "Implemented onRestrictBackgroundWhitelistChanged()." into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 17:44:54 +0000]
Merge "Implemented onRestrictBackgroundWhitelistChanged()." into nyc-dev

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 20 Apr 2016 07:04:14 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoImplemented onRestrictBackgroundWhitelistChanged().
Felipe Leme [Tue, 19 Apr 2016 17:25:20 +0000]
Implemented onRestrictBackgroundWhitelistChanged().

BUG: 27481520
Change-Id: I84db23b62f60dadefc01ead78f13ed689943baad

3 years agoTidy up uses of Integer.valueOf.
Narayan Kamath [Tue, 19 Apr 2016 11:01:11 +0000]
Tidy up uses of Integer.valueOf.

Use parseInt when the result is assigned to an int. Allocates fewer
objects.

bug: 28078871
Change-Id: I2c58112795fecce6395c558f2bb1e1fefe83a5bf

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 23:00:44 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 21:47:42 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 19:01:40 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 18:44:00 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 10 Apr 2016 07:04:51 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoExtra comments for multinetwork downloading
Robin Lee [Fri, 8 Apr 2016 11:01:19 +0000]
Extra comments for multinetwork downloading

Bug: 27074270
Change-Id: I7145fcdf0c8af0f0c299ca491f01eaef6204e2cb

3 years agoMerge "Implement multi-network downloads" into nyc-dev
Robin Lee [Thu, 7 Apr 2016 16:43:13 +0000]
Merge "Implement multi-network downloads" into nyc-dev

3 years agoImplement multi-network downloads
Robin Lee [Thu, 24 Mar 2016 12:02:50 +0000]
Implement multi-network downloads

Downloads should use the default network for the caller. This prevents
applications from, for example, bypassing VPN by routing all requests
through the DownloadProvider.

Bug: 27074270
Change-Id: I7830226dd2910757d3a5c78f373330f84637ccfa

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 5 Apr 2016 07:03:47 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoRemove stale download notifications.
Jeff Sharkey [Mon, 4 Apr 2016 16:11:52 +0000]
Remove stale download notifications.

Bug: 27971263
Change-Id: Ia68d43828ecc32c1b6a656a0d3bb751b2a2e7881

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 31 Mar 2016 07:04:21 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoAvoid flashing download notifications.
Jeff Sharkey [Thu, 31 Mar 2016 02:31:05 +0000]
Avoid flashing download notifications.

When service starts, use new API to read the current set of
notification tags from the system instead of clearing and starting
from scratch.

Bug: 27634130
Change-Id: I049fe5e445a62a52042d7638c2cb50417977435f

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 27 Mar 2016 07:05:20 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoAdd tag to downloadprovider storage tests to run in apct
Md Haque [Thu, 24 Mar 2016 17:39:39 +0000]
Add tag to downloadprovider storage tests to run in apct

Change-Id: I9b2711c2a9b3edd4bbef97ff6cdcae9fdc9ef433

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 23 Mar 2016 07:03:43 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoRemove chmod(0644) for finished downloads.
Jeff Sharkey [Mon, 21 Mar 2016 23:12:39 +0000]
Remove chmod(0644) for finished downloads.

Now that PackageInstaller can read APKs from content:// Uris, we
don't need to make downloads world-readable.  This is mostly just
cleanup, since our top-level private data directory is no longer
o+x, so other apps can't traverse in anyway.

Bug: 5464052
Change-Id: I45de6a40c28b85c64d5afbc13068fe3ae8341d93

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 20 Mar 2016 07:03:21 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 19 Mar 2016 02:26:35 +0000]
Import translations. DO NOT MERGE

Change-Id: I01c4bc11d7a9723a5017aed032d8f8eefe5d4254
Auto-generated-cl: translation import

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 16 Mar 2016 07:02:10 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoMark incomplete downloads as partial.
Steve McKay [Tue, 15 Mar 2016 22:26:08 +0000]
Mark incomplete downloads as partial.

Bug: 27526321
Change-Id: Ic29bc235242a8b87ab8321ee201cb7918594366f

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 13 Mar 2016 08:02:35 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoRemove the Downloads launcher icon.
Steve McKay [Thu, 10 Mar 2016 19:51:04 +0000]
Remove the Downloads launcher icon.

And the intent filter for "BROWSE_DOWNLOADS".

Bug: 27563427
Change-Id: I22e8cbbd49c9d2317146d18d90b15549dadfc69f

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a...
Jeff Sharkey [Thu, 18 Feb 2016 22:36:50 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a939e0 am: 725e5f177d
am: c331875759  -s ours

* commit 'c3318757591bff1c92bf547c9cdb9d76a17fe107':
  DO NOT MERGE. Use resolved path when inserting and deleting.

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting. am: 600d3afcc3 am: dee8c...
Jeff Sharkey [Thu, 18 Feb 2016 22:36:44 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting. am: 600d3afcc3 am: dee8c810c8
am: 38e585c615  -s ours

* commit '38e585c61518c5a9a08c9288ca15f97fdd9339d6':
  DO NOT MERGE. Use resolved path when inserting and deleting.

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a...
Jeff Sharkey [Thu, 18 Feb 2016 22:22:22 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081 am: 0a60a939e0
am: 725e5f177d

* commit '725e5f177d75a37e7ed5b27a99405d1b5fa479dd':
  DO NOT MERGE. Use resolved path when inserting and deleting.

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting. am: 600d3afcc3
Jeff Sharkey [Thu, 18 Feb 2016 22:22:17 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting. am: 600d3afcc3
am: dee8c810c8

* commit 'dee8c810c8edbb90e43db69a4ed1b7d2ee375d07':
  DO NOT MERGE. Use resolved path when inserting and deleting.

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081
Jeff Sharkey [Thu, 18 Feb 2016 19:42:41 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting. am: ebb842e081
am: 0a60a939e0

* commit '0a60a939e00a386f65a48288d8d9a4c7213e2707':
  DO NOT MERGE. Use resolved path when inserting and deleting.

3 years agoMerge "DO NOT MERGE. Use resolved path when inserting and deleting." into mnc-dr1...
Jeff Sharkey [Thu, 18 Feb 2016 19:36:42 +0000]
Merge "DO NOT MERGE. Use resolved path when inserting and deleting." into mnc-dr1.5-dev
am: 102cab3e7d  -s ours

* commit '102cab3e7deee3392a4d4bf818fabc527db0a222':
  DO NOT MERGE. Use resolved path when inserting and deleting.

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting.
Jeff Sharkey [Thu, 18 Feb 2016 19:36:42 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting.
am: ebb842e081

* commit 'ebb842e081f2d9eddbeddb9447631fd81e8961b9':
  DO NOT MERGE. Use resolved path when inserting and deleting.

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting.
Jeff Sharkey [Thu, 18 Feb 2016 19:36:41 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting.
am: 600d3afcc3

* commit '600d3afcc3cbe2a9c3f44eda66bec806709c20e8':
  DO NOT MERGE. Use resolved path when inserting and deleting.

3 years agoMerge "DO NOT MERGE. Use resolved path when inserting and deleting." into mnc-dr1...
Jeff Sharkey [Thu, 18 Feb 2016 19:28:31 +0000]
Merge "DO NOT MERGE. Use resolved path when inserting and deleting." into mnc-dr1.5-dev

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 17 Feb 2016 08:01:37 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting.
Jeff Sharkey [Tue, 16 Feb 2016 23:10:32 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting.

This avoids a race condition where someone can change a symlink
target after the security checks have passed.

Bug: 26211054
Change-Id: I03b06b746fde5d08d6b61a7011bdace0b4e9fa77

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting.
Jeff Sharkey [Tue, 16 Feb 2016 22:47:03 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting.

This avoids a race condition where someone can change a symlink
target after the security checks have passed.

Bug: 26211054
Change-Id: I40ed6d2298e4b66b4f7a055e68d9820515adf351

3 years agoDO NOT MERGE. Use resolved path when inserting and deleting.
Jeff Sharkey [Tue, 16 Feb 2016 23:08:21 +0000]
DO NOT MERGE. Use resolved path when inserting and deleting.

This avoids a race condition where someone can change a symlink
target after the security checks have passed.

Bug: 26211054
Change-Id: Ia58425ab71c1472dd2f2dd31dae000ca29d0bcb2

3 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 9 Feb 2016 08:02:26 +0000]
merge in nyc-release history after reset to nyc-dev

3 years agoUse resolved path for both checking and opening.
Jeff Sharkey [Sun, 7 Feb 2016 20:05:09 +0000]
Use resolved path for both checking and opening.

This avoids a race condition where someone can change a symlink
target after the security checks have passed.

Bug: 26211054
Change-Id: I5e1a2343d631109c21a4c5b2d8d00b2946756680

3 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 16:32:16 +0000]
Import translations. DO NOT MERGE

Change-Id: I35e75084e916075407d7165b852db6ffe4adb74b
Auto-generated-cl: translation import

3 years agomerge in nyc-release history after reset to master
The Android Automerger [Thu, 4 Feb 2016 08:02:01 +0000]
merge in nyc-release history after reset to master

3 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Feb 2016 13:45:42 +0000]
Import translations. DO NOT MERGE

Change-Id: I276e0dbc146c36d68742072d751c065b6615b457
Auto-generated-cl: translation import

3 years agomerge in nyc-release history after reset to master
The Android Automerger [Wed, 3 Feb 2016 08:01:52 +0000]
merge in nyc-release history after reset to master

3 years agoMerge "Migrate the DownloadProvider's trampoline to use SAF Uris."
Tomasz Mikolajewski [Wed, 3 Feb 2016 03:58:02 +0000]
Merge "Migrate the DownloadProvider's trampoline to use SAF Uris."

3 years agoMigrate the DownloadProvider's trampoline to use SAF Uris.
Tomasz Mikolajewski [Tue, 2 Feb 2016 02:55:47 +0000]
Migrate the DownloadProvider's trampoline to use SAF Uris.

Change-Id: I551f830637e023f810a08ba549ecbb7f717b4e9c

3 years agoMerge "Always return FLAG_ARCHIVE for archives in DownloadProvider."
Tomasz Mikolajewski [Wed, 3 Feb 2016 02:11:16 +0000]
Merge "Always return FLAG_ARCHIVE for archives in DownloadProvider."

3 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: dcd74a8a54 -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:54:29 +0000]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: dcd74a8a54  -s ours
am: b5d459abb5  -s ours

* commit 'b5d459abb522571a5feab1da879c93a2e223db18':
  Import translations. DO NOT MERGE

3 years agoImport translations. DO NOT MERGE am: b24f46b8ae -s ours am: 8a199896cb -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:54:23 +0000]
Import translations. DO NOT MERGE am: b24f46b8ae  -s ours am: 8a199896cb  -s ours
am: a829521e3c  -s ours

* commit 'a829521e3c385f441e5c805b0868a9eb45b89b39':
  Import translations. DO NOT MERGE

3 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:50:12 +0000]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: dcd74a8a54  -s ours

* commit 'dcd74a8a549ee25bc4dc9730ba660096e7d88d40':
  Import translations. DO NOT MERGE

3 years agoImport translations. DO NOT MERGE am: b24f46b8ae -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:50:08 +0000]
Import translations. DO NOT MERGE am: b24f46b8ae  -s ours
am: 8a199896cb  -s ours

* commit '8a199896cb9c78adc2cf04082ff7ba42a8b3966a':
  Import translations. DO NOT MERGE

3 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:46:40 +0000]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev

3 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:45:56 +0000]
Import translations. DO NOT MERGE
am: b24f46b8ae  -s ours

* commit 'b24f46b8ae97d6c947a93bd1660a366d9d143438':
  Import translations. DO NOT MERGE

3 years agomerge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 16:40:40 +0000]
merge in nyc-release history after reset to master

3 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:09:02 +0000]
Import translations. DO NOT MERGE

Change-Id: I00e3bb8163e5dc0ef484496fcd5026c2f5122e7a
Auto-generated-cl: translation import

3 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:05:50 +0000]
Import translations. DO NOT MERGE

Change-Id: Ic69e043ba8a8756f71991581aba324840807242e
Auto-generated-cl: translation import

3 years agomerge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 15:28:38 +0000]
merge in nyc-release history after reset to master

3 years agoAlways return FLAG_ARCHIVE for archives in DownloadProvider.
Tomasz Mikolajewski [Tue, 2 Feb 2016 08:06:10 +0000]
Always return FLAG_ARCHIVE for archives in DownloadProvider.

The logic for manage/non-manage UI is moved to DocumentsUI.

Bug: 26321218
Change-Id: I1c9d24bdee493d31fe3bcea2eed877529bc1c32a

3 years agomerge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 08:01:18 +0000]
merge in nyc-release history after reset to master

3 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Feb 2016 13:59:11 +0000]
Import translations. DO NOT MERGE

Change-Id: I050672cccceeb0a0bc285b3612d4a3bb6c368add
Auto-generated-cl: translation import

3 years agomerge in nyc-release history after reset to master
The Android Automerger [Mon, 1 Feb 2016 13:13:06 +0000]
merge in nyc-release history after reset to master

3 years agoTemporary hack to keep file:// Uris working.
Jeff Sharkey [Fri, 29 Jan 2016 02:02:05 +0000]
Temporary hack to keep file:// Uris working.

Bug: 26860922
Change-Id: I9e6d513dedd6c82bd4a582542a9094394d74db5d

3 years agomerge in nyc-release history after reset to master
The Android Automerger [Sun, 24 Jan 2016 08:02:12 +0000]
merge in nyc-release history after reset to master

3 years agoMerge "Revert "Use resolved path for both checking and opening."" into mnc-dr1.5...
Jeff Sharkey [Sat, 23 Jan 2016 01:04:18 +0000]
Merge "Revert "Use resolved path for both checking and opening."" into mnc-dr1.5-dev am: ce08ce4bdb
am: 15185cff91

* commit '15185cff911670eba8f742fe8a2f26de5ed657fe':
  Revert "Use resolved path for both checking and opening."

3 years agoMerge "Revert "Use resolved path for both checking and opening."" into mnc-dr1.5-dev
Jeff Sharkey [Fri, 22 Jan 2016 22:34:22 +0000]
Merge "Revert "Use resolved path for both checking and opening."" into mnc-dr1.5-dev
am: ce08ce4bdb

* commit 'ce08ce4bdbad79f691941671ab42a1149f178894':
  Revert "Use resolved path for both checking and opening."

3 years agoMerge "Revert "Use resolved path for both checking and opening."" into mnc-dr1.5-dev
Jeff Sharkey [Fri, 22 Jan 2016 22:29:16 +0000]
Merge "Revert "Use resolved path for both checking and opening."" into mnc-dr1.5-dev

3 years agoRevert "Use resolved path for both checking and opening."
Jeff Sharkey [Fri, 22 Jan 2016 22:22:25 +0000]
Revert "Use resolved path for both checking and opening."

This reverts commit 366af2ee1f841615d44ab770b537112d769eed05.

Change-Id: Id1155425ebcae23be8ce3916f19dda82eee992c4

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 05:08:07 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf am: ae7d56abe4 am: 224c8b5d4e  -s ours am: e33446d2dc am: 1c88cf50a5 am: fdf77d88dc am: 8814493bfd
am: 354d1cefcc  -s ours

* commit '354d1cefcc7ae24b365cad5f0156f6088856f8e6':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 05:05:05 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf am: ae7d56abe4 am: 224c8b5d4e  -s ours am: e33446d2dc am: 1c88cf50a5 am: fdf77d88dc
am: 8814493bfd

* commit '8814493bfdf1dc52d8aebe848e28b7f0652af18d':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 04:47:35 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf am: ae7d56abe4 am: 224c8b5d4e  -s ours am: e33446d2dc am: 1c88cf50a5
am: fdf77d88dc

* commit 'fdf77d88dca6e6ffa84b0c46dcc512d968fd5f0f':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 02:00:17 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf am: ae7d56abe4 am: 224c8b5d4e  -s ours am: e33446d2dc
am: 1c88cf50a5

* commit '1c88cf50a5220ec6105813392be5ed34b98c7b9e':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:51:20 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf am: ae7d56abe4 am: 224c8b5d4e  -s ours
am: e33446d2dc

* commit 'e33446d2dc4846df0fe93da49090b990e2db9267':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:49:04 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf am: ae7d56abe4
am: 224c8b5d4e  -s ours

* commit '224c8b5d4e15175c9632b25d8a4f3fecc81cc074':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:47:08 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours am: 47784d61cf
am: ae7d56abe4

* commit 'ae7d56abe493e7896a24024d1cf0d16e55609e6e':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:45:07 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours
am: 47784d61cf

* commit '47784d61cf756509e5002b0938af03ce009fd854':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:42:14 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb
am: 1aaf16b00e  -s ours

* commit '1aaf16b00e0bb62547686a742023648d2558f557':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:38:53 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours
am: 46a4c650bb

* commit '46a4c650bbb2699612dd98cd627109db3334af71':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am...
Jeff Sharkey [Thu, 21 Jan 2016 01:25:50 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6
am: 8e6c809370  -s ours

* commit '8e6c8093709b144e69efb8c6bff4be50729f3c25':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874
Jeff Sharkey [Thu, 21 Jan 2016 00:58:31 +0000]
DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874
am: e13f6fa9b6

* commit 'e13f6fa9b6aa1665d0af0df75e1b3a9f7d3d481d':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening.
Jeff Sharkey [Thu, 21 Jan 2016 00:54:58 +0000]
DO NOT MERGE. Use resolved path for both checking and opening.
am: 8a2e551874

* commit '8a2e55187463fd4f8e9f6e80ae89c4e6dcb9b9f6':
  DO NOT MERGE. Use resolved path for both checking and opening.

3 years agoDO NOT MERGE. Use resolved path for both checking and opening.
Jeff Sharkey [Thu, 7 Jan 2016 21:15:59 +0000]
DO NOT MERGE. Use resolved path for both checking and opening.

This avoids a race condition where someone can change a symlink
target after the security checks have passed.

Bug: 26211054
Change-Id: Ie3d2ff0be3f9590869302f0c2d6cdbca1377e7ce

3 years agomerge in nyc-release history after reset to master
The Android Automerger [Tue, 19 Jan 2016 08:01:24 +0000]
merge in nyc-release history after reset to master

3 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 13:40:12 +0000]
Import translations. DO NOT MERGE

Change-Id: I45766d6eba22807d36d839b7ef5114899305caac
Auto-generated-cl: translation import

3 years agoRevert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e...
Jeff Sharkey [Sat, 16 Jan 2016 01:50:52 +0000]
Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3 am: 5a066c39a6 am: 78b21c54af am: 451e81a331 am: 80409f3081 am: 6b8c97d2e4 am: bd15b5ea8f am: e74f002e6e
am: 3fa8b1fe81

* commit '3fa8b1fe8112b050074ef3ee67b3b65869e20a83':
  Revert "Use resolved path for both checking and opening."

3 years agoUse resolved path for both checking and opening. am: 5accb13517 am: 3784acf34c am...
Jeff Sharkey [Sat, 16 Jan 2016 01:50:49 +0000]
Use resolved path for both checking and opening. am: 5accb13517 am: 3784acf34c am: 721a135472  -s ours am: fcbe3a53fa am: da4797f794 am: 9ee6a555cf am: ecd0dab75b am: 6c54c8fc53 am: cbcf09217a am: 6034546747 am: 7a8883afa7 am: e7cd9ebfe5
am: 559022782d

* commit '559022782d4e4209e3dada346bbbda4bcb87d4cf':
  Use resolved path for both checking and opening.

3 years agoUse resolved path for both checking and opening. am: 5c08fb8cbe am: 5d406ad384 am...
Jeff Sharkey [Sat, 16 Jan 2016 01:50:46 +0000]
Use resolved path for both checking and opening. am: 5c08fb8cbe am: 5d406ad384 am: 9d3bd7d1ea am: 13fbee9d2e am: 40b85de66a am: a4a018a5be am: 90e618a6e8 am: 5198da8949 am: d68af9718e
am: 8ffc4870a2

* commit '8ffc4870a20a43b4d2c0789ca54140dfb8aa87a8':
  Use resolved path for both checking and opening.

3 years agoUse resolved path for both checking and opening. am: bdc831357e am: 0e710ca30d am...
Jeff Sharkey [Sat, 16 Jan 2016 01:50:42 +0000]
Use resolved path for both checking and opening. am: bdc831357e am: 0e710ca30d am: c64ced184c  -s ours am: b31d5ef92d am: 69a399f65d am: e987c210b3 am: ea4e83029d
am: 129dd440ca

* commit '129dd440ca9cbef92238fd7ecb0e32c06411a9cf':
  Use resolved path for both checking and opening.

3 years agoRevert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e...
Jeff Sharkey [Fri, 15 Jan 2016 21:36:49 +0000]
Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3 am: 5a066c39a6 am: 78b21c54af am: 451e81a331 am: 80409f3081 am: 6b8c97d2e4 am: bd15b5ea8f
am: e74f002e6e

* commit 'e74f002e6e2f8f00595e4179ed6c3f85da21796b':
  Revert "Use resolved path for both checking and opening."

3 years agoRevert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e...
Jeff Sharkey [Fri, 15 Jan 2016 21:23:59 +0000]
Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3 am: 5a066c39a6 am: 78b21c54af am: 451e81a331 am: 80409f3081 am: 6b8c97d2e4
am: bd15b5ea8f

* commit 'bd15b5ea8fb6bcc1ae56413080c5afcc9fac47fe':
  Revert "Use resolved path for both checking and opening."

3 years agoRevert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e...
Jeff Sharkey [Fri, 15 Jan 2016 21:22:15 +0000]
Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3 am: 5a066c39a6 am: 78b21c54af am: 451e81a331 am: 80409f3081
am: 6b8c97d2e4

* commit '6b8c97d2e434f0608f9fabf2cea6c5371860b23d':
  Revert "Use resolved path for both checking and opening."

3 years agoRevert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e...
Jeff Sharkey [Fri, 15 Jan 2016 21:19:35 +0000]
Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3 am: 5a066c39a6 am: 78b21c54af am: 451e81a331
am: 80409f3081

* commit '80409f3081ae9bae81f6005e12003bde11ed42a0':
  Revert "Use resolved path for both checking and opening."

3 years agoRevert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e...
Jeff Sharkey [Fri, 15 Jan 2016 21:17:41 +0000]
Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3 am: 5a066c39a6 am: 78b21c54af
am: 451e81a331

* commit '451e81a33193986f5de177e7a66393e8aba4134f':
  Revert "Use resolved path for both checking and opening."

3 years agoRevert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e...
Jeff Sharkey [Fri, 15 Jan 2016 21:15:08 +0000]
Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3 am: 5a066c39a6
am: 78b21c54af

* commit '78b21c54af58acd7acc40f1cd010a8cf8ed1d07b':
  Revert "Use resolved path for both checking and opening."

3 years agoRevert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e...
Jeff Sharkey [Fri, 15 Jan 2016 21:13:09 +0000]
Revert "Use resolved path for both checking and opening." am: 6947a091f1 am: cd15221e33 am: 9f47480ba2  -s ours am: 9294cf83d9 am: e6235ebca3
am: 5a066c39a6

* commit '5a066c39a6149d155ba7b4a6aada49bf6bfe240a':
  Revert "Use resolved path for both checking and opening."