summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 2c86de8a: Merge "Throw correct exception for null paths" into mnc-devMarco Nelissen2015-07-291-1/+5
| |\ | | | | | | | | | | | | * commit '2c86de8ad3e8724d2c1d0325606188ecf69e3128': Throw correct exception for null paths
| | * Merge "Throw correct exception for null paths" into mnc-devMarco Nelissen2015-07-291-1/+5
| | |\
| | | * Throw correct exception for null pathsMarco Nelissen2015-07-271-1/+5
| | | | | | | | | | | | | | | | | | | | Bug: 22519119 Change-Id: I8aff294201dfd8ec46ff3d30e4ceecea1346f29b
* | | | 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 4b0fb0cf: Use own package name when not processing IPC.Jeff Sharkey2015-07-271-1/+9
| |\| | | | | | | | | | | | | | | | | | * commit '4b0fb0cf9cf5560980225bd6b18e14597d90cf0d': Use own package name when not processing IPC.
| | * | Use own package name when not processing IPC.Jeff Sharkey2015-07-271-1/+9
| | |/ | | | | | | | | | | | | Bug: 22753582 Change-Id: I73f3e8b7bc3fabab92909a183fcc71be7bb667b4
* | | 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 55f76906: Check app-ops when enforcing permissions.Jeff Sharkey2015-07-251-24/+55
| |\| | | | | | | | | | | | | * commit '55f7690693b3b5b190f11a412a6be0ad4d0ccffc': Check app-ops when enforcing permissions.
| | * Check app-ops when enforcing permissions.Jeff Sharkey2015-07-241-24/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enforcing various storage permissions, check associated app-ops to see if they've been revoked. We're okay throwing outright, since Environment already told the app that volumes are unmounted, so they have no business poking around. Read/write sanity checking should only be relaxed to group-level for files living on storage devices; continue using globally readable flags for all other files. Refresh storage paths whenever volumes change. Bug: 22718722 Change-Id: I8640998f490550b4cd3a9b27bb6cb1a658bd102a
* | | 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 182ee96c: Move permission checking from "other" to "group."Jeff Sharkey2015-07-211-2/+2
| |\| | | | | | | | | | | | | * commit '182ee96cece8f8fb2c33f127f34152939040e531': Move permission checking from "other" to "group."
| | * Move permission checking from "other" to "group."Jeff Sharkey2015-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new storage layout used for runtime permissions uses the "group" ACL for enforcing access, and the "other" ACL is usually masked off completely. Bug: 22525550 Change-Id: I29b48cc3425ccfc8d3ff5ec323c8dc50be104878
* | | 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 2b9f137d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | * commit '2b9f137db367e7ca9e930ce80d803bdbc2377611': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-07-151-1/+1
| | | | | | | | | | | | | | | Change-Id: Icaec8bfe7bbb2f0562b016d30cad70b1b1192b99 Auto-generated-cl: translation import
* | | am 80d1a86b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
|\| | | |/ |/| | | | | * commit '80d1a86bf9a942d260a75a3e718997fcff276369': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGEGeoff Mendal2015-07-111-1/+1
|/ | | | | Change-Id: I0ffc7a51788743afbbee645e62a8cc4ded39f229 Auto-generated-cl: translation import
* MtpService always expects a start intent.Jeff Sharkey2015-07-091-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
* Generate stable MTP storage IDs.Jeff Sharkey2015-07-082-17/+22
| | | | | | | | | It ends up that MediaProvider is persisting MTP storage IDs in its database, so we need to make sure we generate stable IDs over time, otherwise we can end up looking into a black hole. Bug: 22256092 Change-Id: Ia419c37f87c7c0aa59ef0de530fd219c82988f6c
* Localize <unknown> from MediaProvider.Makoto Onuki2015-06-121-2/+12
| | | | | | Bug 21581123 Change-Id: I765e047ea65b3b6e19b3814502246a31be1b41b3
* Fix USB access control when adb is disabled.Nick Kralevich2015-06-102-40/+13
| | | | | | | | | | | | | | | | | | | When adb is disabled, the default usb mode would be "none", which would turn off the driver and prevent UsbDeviceManager from receiving any new USB connect / disconnect messages. This prevents the user from ever enabling MTP and sharing data when adb is turned off. As discussed in bug 21429947, we work around this problem by keeping the USB driver in MTP mode most of the time, so that we continue to receive USB connect / disconnect messages. To avoid leaking confidential user photos, this change honors the unlock state sent to us by the UsbDeviceManager code. We only expose user data if explicitly authorized by the user. MTP being enabled is decoupled from data being exposed on the USB connection. Bug: 21429947 Change-Id: I495011aa4e3e18c5e5e6fe7b9d0e1a3efe747ee7
* Merge "Add support for AudioAttributes flags in RingtonePickerActivity" into ↵Jean-Michel Trivi2015-05-211-0/+13
|\ | | | | | | mnc-dev
| * Add support for AudioAttributes flags in RingtonePickerActivityJean-Michel Trivi2015-05-211-0/+13
| | | | | | | | | | | | | | | | | | | | Read EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS from intent to change the AudioAttributes flags on the Ringtone instance used to play the selected ringtone. Bug 19407114 Change-Id: I2d923ef27e8db19b2560a129ba2462c90a07a997
* | Make ringtone picker use material themeJason Monk2015-05-201-5/+1
|/ | | | | Bug: 21078077 Change-Id: Ia46ee652bfff8457e62dfb952976265f7b71f2ce
* Only extract FAT UUID for primary physical.Jeff Sharkey2015-04-241-1/+4
| | | | | | | | We can now have primary emulated removeable storage, which causes this code to be upset. Bug: 19993667 Change-Id: Id806c5d41ede6e040af9a48496b9e103a9c75962
* Follow MtpStorage refactoring.Jeff Sharkey2015-03-301-3/+3
| | | | | Bug: 19993667 Change-Id: I6380ac08f2eb91af81277d0ace42943e20112b2d
* Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+28
| | | | | Change-Id: Id82303db23cbce43771ec4ecb00ad0e17b878513 Auto-generated-cl: translation import
* am c6802bdd: (-s ours) am 8eef6eb7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
|\ | | | | | | | | * commit 'c6802bddbb2b906643e95a212a4149b3462aa3f8': Import translations. DO NOT MERGE
| * am 8eef6eb7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
| |\ | | | | | | | | | | | | * commit '8eef6eb7709849f1e769a4a88ad663122784565e': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-262-3/+3
| |/ | | | | | | | | Change-Id: I5988280d041a4f6876cd9fa73cffdfd83b1b8151 Auto-generated-cl: translation import
* | am 0605408d: (-s ours) am 2b827555: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
|\| | | | | | | | | * commit '0605408dd7198b13a9529adefd6a172eff92dec9': Import translations. DO NOT MERGE
| * am 2b827555: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
| |\ | | | | | | | | | | | | * commit '2b8275550c732c6f7e7857ebfde3c494d8d061f6': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-121-2/+2
| | | | | | | | | | | | | | | Change-Id: I75a1e1f5da8f91337a13286c7f39ac6ae3bbe094 Auto-generated-cl: translation import
* | | am fe619b53: am 1baeeea4: am d1f37448: Check mCurrentThumbRequest.mPath to ↵leozwang2015-02-091-16/+18
|\| | | | | | | | | | | | | | | | | | | | prevent crash. * commit 'fe619b536938e7c2835c4858b96983ff7d297932': Check mCurrentThumbRequest.mPath to prevent crash.
| * | am 1baeeea4: am d1f37448: Check mCurrentThumbRequest.mPath to prevent crash.leozwang2015-02-071-16/+18
| |\| | | | | | | | | | | | | * commit '1baeeea4c716b650346030e6da7bee38609028cf': Check mCurrentThumbRequest.mPath to prevent crash.
| | * am d1f37448: Check mCurrentThumbRequest.mPath to prevent crash.leozwang2015-02-061-16/+18
| | |\ | | | | | | | | | | | | | | | | * commit 'd1f37448350890725736ababcc23c7deb0b2153f': Check mCurrentThumbRequest.mPath to prevent crash.
| | | * Check mCurrentThumbRequest.mPath to prevent crash.leozwang2015-02-061-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 19246412 Change-Id: I25c2f09ded0527ac062d9c8a57adf3aa7639ea76
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-0251-51/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2f16853e7de5f06c1888d0f342be7207c2f07da2 Auto-generated-cl: translation import
* | | | No longer need to take care of pre boot msg.Dianne Hackborn2015-01-292-9/+0
| | | | | | | | | | | | | | | | Change-Id: Ib91d67a952582090d1fccf1dc8e7902edad2dfa5
* | | | am 91a80e32: am 9200927d: Merge "MediaProvider: When insert files to ↵Marco Nelissen2014-12-041-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | "internal.db", Don\'t notify MTP." * commit '91a80e32495a825afc3bb13428d3154bf394d747': MediaProvider: When insert files to "internal.db", Don't notify MTP.
| * | | am 9200927d: Merge "MediaProvider: When insert files to "internal.db", ↵Marco Nelissen2014-12-041-2/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don\'t notify MTP." * commit '9200927da3277128cfb517d54cea8be52d6ae602': MediaProvider: When insert files to "internal.db", Don't notify MTP.
| | * \ \ Merge "MediaProvider: When insert files to "internal.db", Don't notify MTP."Marco Nelissen2014-12-041-2/+10
| | |\ \ \
| | | * | | MediaProvider: When insert files to "internal.db",xiaochao2014-12-021-2/+10
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't notify MTP. Steps to Reproduce: 1. Connect DUT to Win7 PC via USB cable. 2. Do Factory reset, don't unplug the USB cable during the reset. ->DUT will reboot automatically after factory reset. 3. After DUT enters the system, transfer some files to the DUT by MTP or take some photos by Camera. Expected Results: Read DUT files normally on Win7 PC. Actual Results: The files transferred by MTP are named as "Local Disk" on the PC. And the photos token by Camera can not be showed. After file is inserted into "internal.db", don't notify MTP. If notify, PC will get no data from DUT because MtpServer will only query file's info from "external.db" and after PC gets no data so many times, it won't send "GetObjectPropList" request to DUT, that will cause "Local Disk" showed on the PC side. Change-Id: I6cb364158dbda8b267bdfbf6663d0682f7d4d6cb Signed-off-by: xiaochao <xiaochao.huang@intel.com> Signed-off-by: Bo Huang <bo.b.huang@intel.com>
* | | | | am d60468b0: am 1aadca5b: am d1b7c58a: Fix SQLiteDiskIOException in ↵Benson Huang2014-11-211-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stability test * commit 'd60468b0587d5a579c85f644201e5caff5b5b116': Fix SQLiteDiskIOException in stability test
| * | | | am 1aadca5b: am d1b7c58a: Fix SQLiteDiskIOException in stability testBenson Huang2014-11-211-0/+9
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '1aadca5b154928c42a936d8ab4b71c9457a81ede': Fix SQLiteDiskIOException in stability test
| | * | | am d1b7c58a: Fix SQLiteDiskIOException in stability testBenson Huang2014-11-211-0/+9
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit 'd1b7c58a1c14229873987af728c4c598f86bd107': Fix SQLiteDiskIOException in stability test
| | | * | Fix SQLiteDiskIOException in stability testBenson Huang2014-11-211-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because Sprout has removable storage, the framework needs to maintain external database for keeping multiple databases between SD cards. When cleaning up databases for old external storage volumes, we can't delete .db-shm and .db-wal because these two files always have the latest data and .db doesn't have. Using camera or Google+ will access .db-shm and .db-wal to get the latest data and will cause SQLite Disk I/O exception if they are deleted. The fix is to modify the logic of cleaning up databases (only delete .db file, not to delete .db-shm and .db-wal file). Bug 18412563 Review: https://partner-android-review.git.corp.google.com/#/c/187072 Signed-off-by: Benson Huang <benson.huang@mediatek.com> Change-Id: I484bd535ddebee09824a10f12241f6b2ce086b94
* | | | | am a34df9b3: (-s ours) am 1646ab9f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a34df9b3e95ffa06d8a09820d4206cb5baf720b8': Import translations. DO NOT MERGE
| * | | | am 1646ab9f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '1646ab9f8650d341af3e976a1afead8b79365bdc': Import translations. DO NOT MERGE