summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add and enforce ALLOW_METERED column.Jeff Sharkey2012-04-176-5/+28
| | | | | | | | | | | | Include flag with each download to indicate if its allowed to proceed over metered networks. Downloads are left in WAITING_FOR_NETWORK state, similar to how ALLOWED_NETWORK_TYPES is handled. Also keep blocked downloads in WAITING_FOR_NETWORK state instead of marking them as failed. Bug: 3001465, 5734560 Change-Id: I80bb9aa9bd25ddf6f7a2472db344b6ba6878bd74
* View file downloads through DownloadsProvider.Jeff Sharkey2012-04-172-14/+52
| | | | | | | | | When viewing file://-style downloads, open through DownloadsProvider so that FLAG_GRANT_READ_URI_PERMISSION works. Add support for OpenableColumns to support external apps probing for metadata. Bug: 6343461 Change-Id: I630405406321ea1871c62cbcded55a4ee024ef6e
* Locking around downloads, and more dump info.Jeff Sharkey2012-04-132-114/+143
| | | | | Bug: 4997552 Change-Id: I3c612acb5145a7638c9345a376a99958851a0891
* Give DownloadManager a useful user agent.Jeff Sharkey2012-04-092-3/+33
| | | | | | | | Include platform version, model, and build, when available. Matches current logic used by Browser. Bug: 6257336 Change-Id: I0addfd944aff13bd4ce4226bb8d6328da6b0f5d5
* Move to new NetworkPolicyManager accessor.Jeff Sharkey2012-04-051-1/+1
| | | | Change-Id: I21e5f6280748529bad881942f8f5534aa374ba55
* Migrate to shared MockWebServer.Jeff Sharkey2012-03-2910-704/+112
| | | | | Bug: 4726601 Change-Id: Ibe537bd5c2a092dbf974360cd454751881f7f4ea
* Import translations. DO NOT MERGEEric Fischer2012-03-271-1/+1
| | | | Change-Id: If1d8435e21fcfaf8d9d742f3077333fc1d45137f
* Import translations. DO NOT MERGEEric Fischer2012-03-231-7/+7
| | | | Change-Id: I472ad4749ceeaa967f4fd7ba2fdf2cfb5e97509a
* Merge remote-tracking branch 'goog/ics-aah-exp'Mike Lockwood2012-03-210-0/+0
|\ | | | | | | | | | | empty -s ours merge Change-Id: I6cfeced57f7c36e771b349f65a1a3e13e199890e
| * am f720bc68: Allow downloads when no network restriction set.Jeff Sharkey2012-01-061-2/+3
| |\ | | | | | | | | | | | | * commit 'f720bc684b1a8332eb4d5f8d25c5feaf7eb54433': Allow downloads when no network restriction set.
| * \ am a318a7fc: Import revised translations. DO NOT MERGEEric Fischer2011-11-292-3/+3
| |\ \ | | | | | | | | | | | | | | | | * commit 'a318a7fc77521dae0ea4afdc087dd30973e89f50': Import revised translations. DO NOT MERGE
| * \ \ am fd849573: Import revised translations. DO NOT MERGEEric Fischer2011-11-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'fd849573befdb2d87b6d90fa99e85991c7eac89e': Import revised translations. DO NOT MERGE
| * \ \ \ am c76eb5fa: Import revised translations. DO NOT MERGEEric Fischer2011-11-164-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c76eb5fad1d368367aca37056cc52211d3da9701': Import revised translations. DO NOT MERGE
| * \ \ \ \ am 0fe3c81d: am 8ed79f16: Import revised translations. DO NOT MERGEEric Fischer2011-11-151-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0fe3c81d681ce35ef7506aa9d60d390305cad8be': Import revised translations. DO NOT MERGE
| * | | | | | make DownloadManager download over ethernet - do not mergeDoug Zongker2011-11-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes DownloadManager treat an ethernet connection like a wifi one. Will be okay for aah; fixing properly requires a DownloadManager API change that we're not sure is allowed at this point. Change-Id: Ie03479d334f5e09bd7a91f2998fc4b1f77b95e6a
| * | | | | | am 53333438: Import revised translations. DO NOT MERGEEric Fischer2011-11-016-14/+214
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '53333438f95f817d48b7308c694a668c819cb0a4': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ Merge remote branch 'goog/ics-mr1' into ics-aahEd Heyl2011-10-310-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 9ce986c7: am 36deb30d: Merge remote branch \'goog/ics-mr0\' into ics-mr1Ed Heyl2011-10-261-7/+7
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ce986c7a2991ab88759059f6b1e7b207986360c': Sanity check only after updating from file size.
| | * \ \ \ \ \ \ \ \ \ am 0c6c8d08: Import revised translations.Eric Fischer2011-10-2546-598/+598
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c6c8d08702ed27b7777fb947bce37221014e147': Import revised translations.
| | * \ \ \ \ \ \ \ \ \ \ am 3e149d56: am 3074179d: Merge "add more logging when download manager ↵Doug Zongker2011-10-181-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deletes files" into ics-mr0 * commit '3e149d56b94639aef98c11e0f857d5329c2acc18': add more logging when download manager deletes files
| | * \ \ \ \ \ \ \ \ \ \ \ am 4ac06391: Merge "Import revised translations."Eric Fischer2011-10-183-1/+101
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ac06391010dbd80bfdf22bf7fc6f2f72a5528b3': Import revised translations.
| | * \ \ \ \ \ \ \ \ \ \ \ \ am ea09b344: fix build break (unescaped apostrophe in string)Doug Zongker2011-10-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea09b3443af25599ff785f1571d9a6bb45fb3194': fix build break (unescaped apostrophe in string)
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 96d52cbd: am 3d2ccc9f: Merge "log when DownloadManager deletes files" ↵Doug Zongker2011-10-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '96d52cbd2952f188c6d9cc53908ee7bc4182d255': log when DownloadManager deletes files
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c2e47877: (-s ours) am adbfa3ee: (-s ours) Import revised translations. ↵Eric Fischer2011-10-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit 'c2e4787776c992386f688549c0a7bc69c30613cd': Import revised translations. DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 59dc7f60: String edits to bring UI text to standards. Bugs: 5165745, ↵Claudia de Veaux2011-10-181-23/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5163232, 5162668, 5162667, 5162328 * commit '59dc7f60d45c80ba52ea4e63b38748fd3ff409e1': String edits to bring UI text to standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5daf15eb: am c5c30ba1: NPE check before finalizeDestinationFile().Jeff Sharkey2011-10-171-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5daf15ebb799fa78cfe134bbdb7d69e3cb7244d3': NPE check before finalizeDestinationFile().
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 255582a7: Fix test to match behavior after 5196436.Jeff Sharkey2011-10-131-11/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '255582a7542bc16622369986e1ba0484270b2e8d': Fix test to match behavior after 5196436.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35b3fef2: Merge "Check canonical path when download requested."Jeff Sharkey2011-10-121-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35b3fef25fc2509bb59371f0a1d2d2332db62487': Check canonical path when download requested.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f4411b0e: log when DownloadManager deletes filesDoug Zongker2011-10-111-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4411b0e2255b9abe56e227225398b2aec2a7427': log when DownloadManager deletes files
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0ca8ce56: Import revised translations.Eric Fischer2011-10-103-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ca8ce569a4d12ac9ef6845caee50e369b56ab84': Import revised translations.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5d199c1b: Import revised translations.Eric Fischer2011-09-303-8/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d199c1b3dca682789be8f9ffb85883395090cd1': Import revised translations.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a9258048: am b395484d: Updated Download Manager launcher iconJustin Ho2011-09-255-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9258048a5e1559aa2b5928e89c10cca1dba6a5c': Updated Download Manager launcher icon
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 921a5c3c: (-s ours) am 15139db3: (-s ours) Import revised translations. ↵Eric Fischer2011-09-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '921a5c3c082d102ac7d1a9bf4cc26d26bcf99a81': Import revised translations. DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd0c7f3b: (-s ours) am 09157020: (-s ours) Import revised translations. ↵Eric Fischer2011-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit 'cd0c7f3b38d325d3f89b01d8408ae824780100cc': Import revised translations. DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 43d788e7: Import revised translations.Eric Fischer2011-09-208-100/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43d788e715d0a55536ae5c27d07394aef08f4685': Import revised translations.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 286b68c5: (-s ours) am 8c72a589: (-s ours) Import revised translations. ↵Eric Fischer2011-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE * commit '286b68c50816291d2e5d72a639a94b2da33800a3': Import revised translations. DO NOT MERGE
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e78ced9628cd22fb59a17749f2ac9ce75ddbf73
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-074-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7df2d63cc2c51b79d98b4889687a8035453d125e
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-0610-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ac6da326a7a4d15acc84d0301688ca2f4a6ed9a
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-0548-86/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c6cda860dbf7574608e79cc36d481d5c7f75565
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-0248-48/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7069f3d2be0bb43238df3ce3dc585f7b9a9edb53
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 50c85944: Match INetworkPolicyListener changes.Jeff Sharkey2012-02-071-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50c85944bf5e949ad5116fec9564318b3be90f24': Match INetworkPolicyListener changes.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match INetworkPolicyListener changes.Jeff Sharkey2012-02-071-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78b6b0380a42b28f42334f93e0538ba7f32bc66d
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dc8940b5: am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc8940b538a2261e0f0dbf027362cc1c359c7cd6':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '71d3ff5dd317c5957f1f6b0cc877a3fceabbb445':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 55231bc5: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55231bc588e71c23f9d6ac5a94e72e96c3825991':
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd173b02bfba0a495cd0ec5df37154c269c87b91