summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-21Snap for 4793706 from fc3a4088f3c9c87b28d10a4e67b40732217e811d to pi-releaseandroid-build-team Robot
Change-Id: Ia00a0de608c5956c5861671dc93e3af13b3c3654
2018-05-19[automerger skipped] Import translations. DO NOT MERGE skipped: cd6db9ecb1 ↵Bill Yi
skipped: 60f9184f36 am: 6501a185b9 -s ours am: 7dafb577cc -s ours am: 3b45644f85 -s ours Change-Id: Ia6630bb3da5bc1e5687bb05b4091681673502357
2018-05-19[automerger skipped] Import translations. DO NOT MERGE skipped: cd6db9ecb1 ↵Bill Yi
skipped: 60f9184f36 am: 6501a185b9 -s ours am: 7dafb577cc -s ours Change-Id: I9777be585c2cdd57cd26890f5007b29f57b803b1
2018-05-19[automerger skipped] Import translations. DO NOT MERGE skipped: cd6db9ecb1 ↵Bill Yi
skipped: 60f9184f36 am: 6501a185b9 -s ours Change-Id: I6503a4604c54ddced725822542d32d6613c83b97
2018-05-19[automerger skipped] Import translations. DO NOT MERGE skipped: cd6db9ecb1 ↵Android Build Merger (Role)
skipped: 60f9184f36 Change-Id: Ic28efa86d6eaf0c304358d49eb7f08477bbef142
2018-05-19[automerger skipped] Import translations. DO NOT MERGE skipped: cd6db9ecb1Android Build Merger (Role)
Change-Id: I8e435c0e38cb5b3d9c72785a31b5ba03338beca2
2018-05-18Import translations. DO NOT MERGEBill Yi
Change-Id: If68e338a0b3959f5c9397b1d4149ea5e7f481d93 Auto-generated-cl: translation import
2018-05-10Snap for 4773106 from 899152ac438889a19bb37c32a4c6608de35ffc46 to pi-releaseandroid-build-team Robot
Change-Id: I4369de89201c414d3260f6778fd892f5ad977bb8
2018-05-04Only rescan ringtones and such, not everythingMarco Nelissen
We really only localize ringtones, alarms and notifications, so there is no need to rescan everything, potentially losing manual edits the user did. Bug: 74821529 Bug: 74506985 Test: manual Change-Id: Ic3cb31b96d91319a77889755476e9b6fd21c2141
2018-04-30Snap for 4752322 from 22d4a757b41b04d383ae4f18d201506012c2754f to pi-releaseandroid-build-team Robot
Change-Id: I50bb2a326d503cfc9c540b0d99bea0169a74cb42
2018-04-29Snap for 4751833 from ff93c6cb125b4f0634071a1022a8ddf39533f0e6 to pi-releaseandroid-build-team Robot
Change-Id: I7b082fa968decce80854548f41cf066b0ed8b8b6
2018-04-28Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I224467b888eaf90d022a16aedf66bd441055354e
2018-04-27Don't treat failed scans as valid media filesMarco Nelissen
Instead, add them to the MediaProvider as non-media files. Bug: 77656952 Test: manual, CTS Change-Id: I3816e258bd092307280d93dca8c7ce8f539ffcf5
2018-04-22Snap for 4736748 from 881c0bb35f8c895040afc3c198f0cf522585c855 to pi-releaseandroid-build-team Robot
Change-Id: I673880f51c29deb65c6692b4d3c5218e2b972edf
2018-04-20Merge "Only set RESULT_CANCELED for RingtonePickerActivity if it's ↵TreeHugger Robot
explicitly canceled." into pi-dev
2018-04-18Snap for 4728508 from b949f084fe245afcc5ad163d0e91a4305356f441 to pi-releaseandroid-build-team Robot
Change-Id: If7faeecd1e1a8787a215915c7b01561ad2b9bcb3
2018-04-17Only set RESULT_CANCELED for RingtonePickerActivity if it's explicitly canceled.Joshua Trask
In handset, a RESULT_OK status with a null EXTRA_RINGTONE_PICKED_URI indicates an affirmative selection of the "Silent" ringtone. We were previously returning RESULT_CANCELED if the selection was the same as the previously-selected ringtone (which would over-trigger when clients omitted the EXTRA_RINGTONE_EXISTING_URI, indicating that they don't know any existing ringtone, but not necessarily that they would default to 'silent' if the picker is canceled). After this change, we'll correctly return RESULT_OK with a null extra. In Wear, no client requires us to set RESULT_CANCELED just to indicate that the selection was unchanged or restored to default by the time the user left the activity, and since we have no explicit "cancel" button the result is just the same as if the user re-selected the same ringtone; we can simply use RESULT_OK every time. Bug: 67351809 Fixes: 67351809 Test: manual - repro'd with the RingtonePicker.apk from b/67351809 before making this change, and then observed the correct behavior after the change. Change-Id: I7601618d14af020a8b135a36838fcea0f087ebb9
2018-04-17Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ia76f2df099b8783f8df70404ce11f441b018d7e6
2018-04-15Snap for 4722539 from 9518632678e83c9f7889556f4f5a7b0b1822c281 to pi-releaseandroid-build-team Robot
Change-Id: Ia97ea79bbeee6163a02259647256c069f7df2b85
2018-04-13Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ie67fe55c352d71277525c95a35ea854e1b527236
2018-04-03Snap for 4696032 from 424afc0d902e124412b539a1079be35ce9439b87 to pi-releaseandroid-build-team Robot
Change-Id: Idac859ebbce8bba4426d4ddfd2724a5dee00ba2b
2018-04-02Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2018-04-01Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Icd37326571561be4b7756d183986ae0503e3c0a7
2018-04-01Snap for 4693621 from ddd0dd89492d29f4bf4643cb129bf131dcc1b483 to pi-releaseandroid-build-team Robot
Change-Id: I620c43bb57157dc867a957f33980e79a8e3d0f99
2018-03-31Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I80178a2dec8634304d76c71ef9c144c77c2eacf0
2018-03-28Initialize volumes before registering listenerJerry Zhang
If we get a listener event before volumes are initialized, it could cause a NPE. Bug: 73656609 Test: passes Change-Id: Id5aabc75e2e0ad320cedba1759a346715bdecf1d
2018-03-28Snap for 4683893 from b394251d90e1a3e6aad36cc16d4255e42e4f98cc to pi-releaseandroid-build-team Robot
Change-Id: I8fb45a9ae4e653690f8d297a21ac6f6183d2ef12
2018-03-27Merge "Don't leak MtpDatabase receiver." into pi-devJerry Zhang
2018-03-27Snap for 4680594 from f505f0dcf4142a0bec6bdcf21cf3e94570b1139f to pi-releaseandroid-build-team Robot
Change-Id: I3c852153872b39a304bc880c4fc4713d306d851a
2018-03-27Don't leak MtpDatabase receiver.Jerry Zhang
There is a race on usb disconnect between MtpServer and UsbDeviceManager. If the kernel disconnect signal is sent to MtpService before MtpServer, the service will be stopped before the receiver is unregistered. To fix this, set the server in the database to null when service stops, which also unregisters the receiver. Addtional guards in MtpDatabase make it robust to a null server. Bug: 76433619 Test: no error Change-Id: I99dab3d2fb5884262b680e6a3e5eb4c5fb6a3457
2018-03-18Snap for 4662252 from ae77b6967804af14a82a16ce79243a24d9d027d8 to pi-releaseandroid-build-team Robot
Change-Id: Id97d2b4dfea0ad6aaa704827d5b0de69643a317b
2018-03-15Revert "Make MtpReceiver and MtpService single user."Jerry Zhang
In P the system user can no longer access files of other users. Now that descriptors are owned by UsbService, we can revert to having multiple MtpServices without having synchronization problems. This reverts commit 08bae5c84fd7f2e3f876e60082b37e2865f5ab8d. Bug: 72877143 Test: Use Mtp from multiple users Change-Id: Ida57416ea3379758f3c67bb4acc6cab4d71b3deb
2018-03-15Get control fd from UsbService when server startsJerry Zhang
Instead of configuring the server during each connection, UsbDeviceManager will now hold the control descriptors. The server will then request its control descriptor when it starts. Bug: 72877174 Test: Use mtp/ptp configurations Change-Id: Ib004dc2b8089e22933ef6835b24db2e209226c41
2018-03-15Don't delete files when unmountingJerry Zhang
Make sure the delete query specifically does not delete data. Change-Id: I5e41b43a4d6e65527af89ab7ee1b3a359db12b53 Fixes: 74214251 Test: doesn't delete
2018-03-13Snap for 4651078 from daccb3007e1010b0e213e119ce124d0de6dc6e33 to pi-releaseandroid-build-team Robot
Change-Id: I7ef9bf69155618ea306bc80470a547ddee32a34b
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Marco Nelissen
1579365b16 am: a7a1b17882 am: 7d2d26d85e am: 50945410d3 am: 2dfef2b080 am: de7103ca3f skipped: 0f0d9dab72 am: 61e28e4c2b -s ours am: 136eb5eac6 -s ours am: 8c118064c3 -s ours Change-Id: Ie873adf531f840891633ea29e2f9df4039060988
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Marco Nelissen
1579365b16 am: a7a1b17882 am: 7d2d26d85e am: 50945410d3 am: 2dfef2b080 am: de7103ca3f skipped: 0f0d9dab72 am: 61e28e4c2b -s ours am: 136eb5eac6 -s ours Change-Id: Ib6c5bbf5f31e1d1623969b1cda31ab106ee09756
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Marco Nelissen
1579365b16 am: a7a1b17882 am: 7d2d26d85e am: 50945410d3 am: 2dfef2b080 am: de7103ca3f skipped: 0f0d9dab72 am: 61e28e4c2b -s ours Change-Id: I0028bebea4552e9444658459e6e85265e7b8efaa
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Android Build Merger (Role)
1579365b16 am: a7a1b17882 am: 7d2d26d85e am: 50945410d3 am: 2dfef2b080 am: de7103ca3f skipped: 0f0d9dab72 Change-Id: I5679654c8fc4465f24321ca3f4515be527d2a831
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Android Build Merger (Role)
1579365b16 am: a7a1b17882 am: 7d2d26d85e am: 50945410d3 am: 2dfef2b080 am: de7103ca3f Change-Id: Ieda2a47b78bb4e3b7206f88e3fd8c0eeca251154
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Android Build Merger (Role)
1579365b16 am: a7a1b17882 am: 7d2d26d85e am: 50945410d3 am: 2dfef2b080 Change-Id: I35bea0b7ea22ebbc27bb3ae4d7bb256134768b63
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Android Build Merger (Role)
1579365b16 am: a7a1b17882 am: 7d2d26d85e am: 50945410d3 Change-Id: I318be62b298b681d24b9458ec43687ce8dc8ee8c
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Android Build Merger (Role)
1579365b16 am: a7a1b17882 am: 7d2d26d85e Change-Id: I00a0dfb8634f33c0049733ce15b9015ab829c983
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Android Build Merger (Role)
1579365b16 am: a7a1b17882 Change-Id: I40c5920eb081b22dba3b1c0cfd86a568c45301d5
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9 am: ↵Android Build Merger (Role)
1579365b16 Change-Id: Ia42010f045148cdb733d2dde91844cc1eba8cc9c
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49 am: 490368eee9Android Build Merger (Role)
Change-Id: Ieb7ef72de18da1f0fe187d37b65d3555d5354ac3
2018-03-13[automerger] Rework thumbnail cleanup am: f6b8f04d49Android Build Merger (Role)
Change-Id: I6357b2c97211c58410c21521099f1ddc3ffb619a
2018-03-13Rework thumbnail cleanupMarco Nelissen
Bug: 63766886 Test: ran CTS tests Change-Id: I1173f67d6fb41494d6d069cc7cfc0c2b0dcc1725 Merged-In: I1173f67d6fb41494d6d069cc7cfc0c2b0dcc1725
2018-03-12Merge "Rework thumbnail cleanup" into oc-dr1-dev am: 337bdef15e -s oursMarco Nelissen
am: c757d54381 -s ours Change-Id: I12e51e3b2ab80de21bc837ab06164bc66a6573e3
2018-03-12Rework thumbnail cleanup am: 0f8f5b41e6 -s oursMarco Nelissen
am: bbe9b28d69 -s ours Change-Id: I4ce7d6c350135d6d4e6acb7f786b07afce8b5228
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 20:54:09 +0000