Merge commit '41e8e4a29df084e2e82fe13123d603b26a9eaefb' into kraken
* commit '41e8e4a29df084e2e82fe13123d603b26a9eaefb':
Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Merge commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b' into froyo-plus-aosp
* commit '804878f3a3ea40ace5bd572cee98f9e13a0dbf0b':
Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Merge commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16' into kraken
* commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16':
Fix issue #2558391: Package manager problem when not replacing existing system partition app
Merge commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58' into froyo-plus-aosp
* commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58':
Fix issue #2558391: Package manager problem when not replacing existing system partition app
This fixes the package manager to ensure we can't get in this bad state of
an update to a system app being installed as a separate app.
Change-Id: I2a3f601bbc06b74f31ca09192993614bc6885ff7
Merge commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152' into kraken
* commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152':
added a cleanspec since ActiveSyncInfo.aidl was removed
Merge commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510' into kraken
* commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510':
Use case insensitive matching.
Merge commit '9b9a89a58f50c3004959c36252489fae54fb9c58' into froyo-plus-aosp
* commit '9b9a89a58f50c3004959c36252489fae54fb9c58':
added a cleanspec since ActiveSyncInfo.aidl was removed
Merge commit '9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp
* commit '9253446922d925f6a5453b60d539beed292921a7':
Use case insensitive matching.
Merge commit 'c7418149fafc7ded51a527b1d756028b33af3ac0' into kraken
* commit 'c7418149fafc7ded51a527b1d756028b33af3ac0':
Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
Merge commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690' into froyo-plus-aosp
* commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690':
Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
Merge commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68' into kraken
* commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68':
Support for apps search in apps provider contract
Merge commit '11a7ba367f39175f41300f384ec6e984bcc08d53' into froyo-plus-aosp
* commit '11a7ba367f39175f41300f384ec6e984bcc08d53':
Support for apps search in apps provider contract
Merge commit '07330791116513710d879c45b2f095cd314cbfd0' into froyo-plus-aosp
* commit '07330791116513710d879c45b2f095cd314cbfd0':
Show SD unavailable icon for apps on SD when ejected.
This change include a minor refactoring of PackageItemInfo and related
classes to eliminate code duplication and to avoid redundant work
searching for an ApplicationInfo instance we already have.
Bug: b/2537578
Change-Id: Id0794c3f055ea58b943028f7a84abc7dec9d0aac
A key bit of code was lost in change 38/25338/5 (2009/09/17 change
of RequestQueue.java) which caused us to not pick up proxy settings.
Putting it back.
bug:2364475
Change-Id: I1e79858f64d8e793a966ef8e6f7a0d3f2a02251f
Merge commit '65bfca37fe36c1caef3153c39aa41a273ab776ef' into kraken
* commit '65bfca37fe36c1caef3153c39aa41a273ab776ef':
fix [2542425] memory leak during video recording
Merge commit '544592e14f8d7643238e40ba9879727497900f35' into froyo-plus-aosp
* commit '544592e14f8d7643238e40ba9879727497900f35':
fix [2542425] memory leak during video recording
[Sorted|Keyed]Vector<TYPE> would leak their whole storage when resized
from the end and TYPE had trivial dtor and copy operators.
Change-Id: I8555bb1aa0863df72de27d67ae50e20706e90cf5
and changed the "get next operation to sync" logic just look
at pending syncs, rather than them and periodic syncs
- made syncoperation dup-detection ignore the initialization
sync extra
- made the sync dispatcher treat initialization syncs as just
a regular sync request and also made it explicitly set or
clear the initialization extra based on whether the sync
adapter was in the syncable or unknown state
- change the getNextSync logic to prioritize syncable "unknown"
syncs above everything else (since they should be fast and
are important)
- make it reschedule completed initialization syncs if the
sync adapter is now marked syncable
- fix some logging in SyncStorageEngine
- change SyncStorageEngine to not reuse authority ids when one
is removed
http://b/issue?id=2531359http://b/issue?id=2429638
Change-Id: I79805b582da74f4f0b6193eafaff24c2371d51e8
Merge commit '344ba661ab406759a91ecaba1378a4907971b119' into kraken
* commit '344ba661ab406759a91ecaba1378a4907971b119':
some changes due to an API review
Merge commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp
* commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b':
some changes due to an API review
Merge commit '835f41da7581747b6a03227bcd1e073074ea9329' into kraken
* commit '835f41da7581747b6a03227bcd1e073074ea9329':
Add support for GPS privacy lock. DO NOT MERGE
Merge commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84' into froyo-plus-aosp
* commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84':
Add support for GPS privacy lock. DO NOT MERGE
