summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translations.Eric Fischer2011-06-2051-116/+262
| | | | Change-Id: I17396116e009181cd2039be4142c6fb41199e88c
* Teach DownloadManager about network policy.Jeff Sharkey2011-06-1710-43/+118
| | | | | | | | | | | Now network access is determined by using getActiveNetworkInfoForUid() which uses BLOCKED to indicate that network should be rejected for the requesting UID. While download in progress, watch for any policy changes that should trigger pause. Also check NetworkInfo.isConnected() for correctness. Change-Id: I1efa79823f15ecc3fa088a6719da1b770c64b255
* am e021954e: (-s ours) am 76126492: am d5351de1: Import revised ↵Eric Fischer2011-06-160-0/+0
|\ | | | | | | | | | | | | translations. DO NOT MERGE * commit 'e021954e3d72dff35ecc091b618600b0047ec648': Import revised translations. DO NOT MERGE
| * am 76126492: am d5351de1: Import revised translations. DO NOT MERGEEric Fischer2011-06-152-7/+7
| |\ | | | | | | | | | | | | * commit '761264927e7888da1390e4d1abe26538c7678112': Import revised translations. DO NOT MERGE
| | * am d5351de1: Import revised translations. DO NOT MERGEEric Fischer2011-06-152-7/+7
| | |\ | | | | | | | | | | | | | | | | * commit 'd5351de1d785195474c4a0232b276acb2a2f5bda': Import revised translations. DO NOT MERGE
| | | * Import revised translations. DO NOT MERGEEric Fischer2011-06-152-7/+7
| | | | | | | | | | | | | | | | Change-Id: Ic1471bc3b9503f5ebf8a696391413b12974f086c
* | | | Merge "Download provider change for DRM Forward Lock plugin: to convert .dm ↵Gloria Wang2011-06-038-55/+319
|\ \ \ \ | | | | | | | | | | | | | | | files to .fl files during downloading For bug 3188041"
| * | | | Download provider change for DRM Forward Lock plugin:Gloria Wang2011-04-198-55/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to convert .dm files to .fl files during downloading For bug 3188041 Change-Id: I882b851664432fba3e57dc25a6be827b48006e69
* | | | | Import revised translations.Eric Fischer2011-05-268-0/+478
| | | | | | | | | | | | | | | | | | | | Change-Id: I7b6a31e555f88833d0e5f16f9341d41feca02069
| | | | |
| \ \ \ \
*-. \ \ \ \ Reconcile with gingerbread-release honeycomb-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I99f8eb6e9de9d63b4d7426ec3a75db9e843bffcb
| | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |\ \ \ \ \
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| | | | |
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| | | | |
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| | | | |
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| | | | |
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-040-0/+0
| | |/| | | | |
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | |/| | | | |
| | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-030-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-020-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-020-0/+0
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-02-010-0/+0
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-310-0/+0
| | | | | | | |/| | | | |
| | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-300-0/+0
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-300-0/+0
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-280-0/+0
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-280-0/+0
| | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-270-0/+0
| | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-260-0/+0
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-250-0/+0
| | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-240-0/+0
| | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-230-0/+0
| | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-220-0/+0
| | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-210-0/+0
| | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-200-0/+0
| | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-190-0/+0
| | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-180-0/+0
| | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-170-0/+0
| | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-160-0/+0
| | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-140-0/+0
| | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-130-0/+0
| | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-120-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-110-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-110-0/+0
| | | | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-100-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-070-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to honeycombThe Android Automerger2011-01-060-0/+0
| | | | | | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to masterThe Android Automerger2011-01-050-0/+0
| | | | | | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to masterThe Android Automerger2011-01-050-0/+0
| | | | | | | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | | | | | | | | * | | | | merge in honeycomb-release history after reset to masterThe Android Automerger2011-01-040-0/+0
| | | | | | | | | | | | | | | | | |/| | | | |