summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-13.0-ZNH2Kblinky@build012016-09-181-0/+2
| | | | | Change-Id: I6826d7833cba83ba67484d92844a0db0e6c5b17f Ticket: RM-231
* Automatic translation importpinky@build012016-08-230-0/+0
| | | | | Change-Id: Ibd4239f2dfcf980cd9f387946f78193d55431959 Ticket: RM-231
* Automatic translation importclyde@build012016-08-231-0/+28
| | | | | Change-Id: Ifd7063e779dbdd723537c407d282834e023b61ea Ticket: RM-231
* Automatic translation importclyde@build012016-08-181-0/+28
| | | | | Change-Id: I3fe2ba3bd6bcffe4248398e1ed455c84a47aba6d Ticket: RM-231
* Automatic translation importpinky@build012016-08-131-0/+28
| | | | | Change-Id: I1b625992bfb97cbbc1935097e9e94ef0646e6137 Ticket: RM-231
* Automatic translation importstable/cm-13.0-ZNH2KBAbhisek Devkota2016-05-141-0/+28
| | | | | Change-Id: Icab8d603ae513e98636bac64c332ddecb03eaeaf Ticket: RM-231
* Revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-132-2/+2
| | | | | | | | | | | https://android.googlesource.com/platform/packages/providers/MediaProvider into cm-13.0" This reverts commit 637eb43027b69d91fbeca7ca2bf11f58998a9929, reversing changes made to 8a3b33c20e9bfd96922f8c72a38db971b63f95d6. RM-231 Change-Id: I5e1eea9705da9a3f8f4903e387f3ab0039b76743 (cherry picked from commit d4592ab07637c98cdd1b12898a43bdc78a840674)
* Automatic translation importMichael Bestas2016-04-061-0/+28
| | | | | | RM-231 Change-Id: Ie66b2c069b517e981e4d291b72f4650963e189b3 (cherry picked from commit 8b6ddac28275e0a443965c66838770f099d523b6)
* Automatic translation importMichael Bestas2016-03-282-0/+56
| | | | Change-Id: I2428af0e0976f865c6157a65130183f7b95af900
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-102-2/+2
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/providers/MediaProvider into cm-13.0 Android 6.0.1 release 22
| * am 9f3eacce: am 2e1abd83: Allow deletion of media through SAF.Jeff Sharkey2015-10-141-17/+35
| |\ | | | | | | | | | | | | * commit '9f3eacce1250e96e7a7becb59e06bd49958e2e9e': Allow deletion of media through SAF.
| | * am 2e1abd83: Allow deletion of media through SAF.Jeff Sharkey2015-10-141-17/+35
| | |\ | | | | | | | | | | | | | | | | * commit '2e1abd8307a7994d0c581da321be4aedfe5a5c25': Allow deletion of media through SAF.
| * | | am a895ce63: (-s ours) am f7ccb129: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'a895ce637a3e64638e39e3df0da31a9caea03102': Import translations. DO NOT MERGE
| | * | am f7ccb129: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'f7ccb1299e0eb3ba8086a74f92933ce4c0d3816d': Import translations. DO NOT MERGE
| * | | | am 7c076ae0: am 6ba8af3f: am 72613f7b: Create default directories on all ↵Jeff Sharkey2015-08-201-20/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage devices. * commit '7c076ae06598a1016869b6ee90677fa52e060668': Create default directories on all storage devices.
| | * | | am 6ba8af3f: am 72613f7b: Create default directories on all storage devices.Jeff Sharkey2015-08-201-20/+32
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ba8af3f828f33a2c25c227aa01d67c2202c2fe3': Create default directories on all storage devices.
| * | | | | am 5e699d59: am 4b708b16: am cba15caa: Update primary storage paths when ↵Jeff Sharkey2015-08-161-12/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | volumes change. * commit '5e699d593a38ed4f8bf4fc2ab570ff5568bbfea9': Update primary storage paths when volumes change.
| | * | | | am 4b708b16: am cba15caa: Update primary storage paths when volumes change.Jeff Sharkey2015-08-161-12/+14
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b708b1677b257b12821721affa1435f29c60be4': Update primary storage paths when volumes change.
| * | | | | | am faaebb41: am 22f51e2d: am f94b8b8a: Media provider clears binder id ↵Svetoslav2015-08-052-2/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calling in other providers * commit 'faaebb419a60d4883c182d4931c0d2a79d9f23f7': Media provider clears binder id calling in other providers
| | * | | | | am 22f51e2d: am f94b8b8a: Media provider clears binder id calling in other ↵Svetoslav2015-08-052-2/+15
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | providers * commit '22f51e2d5ae769fd900942bcc6238a298883ab5f': Media provider clears binder id calling in other providers
| * | | | | | | am ce23a0b3: am ffd91065: am 2c86de8a: Merge "Throw correct exception for ↵Marco Nelissen2015-07-291-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null paths" into mnc-dev * commit 'ce23a0b311fa12ead909e98b5803fc0df2768a2a': Throw correct exception for null paths
| | * | | | | | am ffd91065: am 2c86de8a: Merge "Throw correct exception for null paths" ↵Marco Nelissen2015-07-291-1/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'ffd910653896174bba59685d1aa6ef99ffe65ebb': Throw correct exception for null paths
| * | | | | | | | am b004c90e: am 1662f5e0: am 4b0fb0cf: Use own package name when not ↵Jeff Sharkey2015-07-271-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processing IPC. * commit 'b004c90e510d1e2c9c9a9368ee0b6039d2be7426': Use own package name when not processing IPC.
| | * | | | | | | am 1662f5e0: am 4b0fb0cf: Use own package name when not processing IPC.Jeff Sharkey2015-07-271-1/+9
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1662f5e0e3254cb28c600dcf747133419a7a88f1': Use own package name when not processing IPC.
| * | | | | | | | | am 312cd9ce: am 5f08e673: am 55f76906: Check app-ops when enforcing permissions.Jeff Sharkey2015-07-251-24/+55
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '312cd9cebaeee2f572e576265bb5ea75c581d2de': Check app-ops when enforcing permissions.
| | * | | | | | | | am 5f08e673: am 55f76906: Check app-ops when enforcing permissions.Jeff Sharkey2015-07-251-24/+55
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5f08e6732613b343acd8755de518c245be695610': Check app-ops when enforcing permissions.
| * | | | | | | | | | am 2e0ce07a: am f9389e61: am 182ee96c: Move permission checking from "other" ↵Jeff Sharkey2015-07-211-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to "group." * commit '2e0ce07a4d3932477d263f981fe8d800f2ebd917': Move permission checking from "other" to "group."
| | * | | | | | | | | am f9389e61: am 182ee96c: Move permission checking from "other" to "group."Jeff Sharkey2015-07-211-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9389e6168ac5d83da94eca8bbd1272a89612578': Move permission checking from "other" to "group."
| * | | | | | | | | | | am 2be4ef48: (-s ours) am d99040fa: (-s ours) am 2b9f137d: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '2be4ef4895d29dc8a9a70b40b7f33aa128774a12': Import translations. DO NOT MERGE
| | * | | | | | | | | | am d99040fa: (-s ours) am 2b9f137d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd99040fac50c782faa67627790516fd58cb7491d': Import translations. DO NOT MERGE
| * | | | | | | | | | | | am 31765c69: (-s ours) am 80d1a86b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31765c6973a5adfa2fa9f941769c18b5f40bcb38': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am 80d1a86b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80d1a86bf9a942d260a75a3e718997fcff276369': Import translations. DO NOT MERGE
* | | | | | | | | | | | | Automatic translation importMichael Bestas2016-03-0513-0/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6be665d5a2aaa7652ba8fb4f843184801ad14cb4
* | | | | | | | | | | | | Automatic translation importMichael Bestas2015-12-254-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ad122cb037084f72c01c04c690881490850ad06
* | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-071-17/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/providers/MediaProvider into HEAD Android 6.0.1 release 3
| * | | | | | | | | | | | Allow deletion of media through SAF.Jeff Sharkey2015-10-131-17/+35
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we're putting the media roots up front and center through the Settings > Storage UI, users have an expectation of deleting media to free up disk space. Bug: 24450605 Change-Id: I38e1b021db2bf1f42a43f81f609818df905a0c0b
* | | | | | | | | | | | Fix mounting of non-FAT formatted SD cards (2/2)Michael Bestas2015-11-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77fe9e09b523bcba68dd2409def68acb715ca33c
* | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26
| * \ \ \ \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | | * | | | | | | | | Media provider clears binder id calling in other providersSvetoslav2015-08-052-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The media provider can call into the downloads provider which runs in the same process from an IPC. In this case the permission and ap ops checks in the downloads provider will be verified against the caller of the media provider instead of against the media provider itself. bug:22629557 Change-Id: I444a2db96353f50c60cd1d7bb20538ab7d463a1e
| | | | * | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-300-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | | | | * | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-280-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / | | | | | |/| | | | | | |
| | | | | | * | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-250-0/+0
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|_|_|/ / | | | | | | |/| | | | | |
| | | | | | | * | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-220-0/+0
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |_|_|_|/ / | | | | | | | |/| | | | |
| | | | | | | | * | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-120-0/+0
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |_|/ / / | | | | | | | | |/| | | |
| | | | | | | | | * | | | MtpService always expects a start intent.Jeff Sharkey2015-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return START_REDELIVER_INTENT to make sure we always get the intent if we're ever killed and restarted. Bug: 22349167 Change-Id: I696284b8d55a8c8d1fb2362cd769981ae0d45366
| | | | | | | | | * | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-090-0/+0
| | | | | | | | | |\ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-181-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1416aab56f9d5a277bffd9f31015e9d54557aa4d Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:52:20 +0000