Commit Graph

20683 Commits

Author SHA1 Message Date
Dirk Dougherty
d94a2bb07f am d1a1ea05: am 59e644e3: doc change: cherry pick c87f7a658e from master
Merge commit 'd1a1ea05ba3aa48fd65ea225d5c5c757232e4979' into kraken

* commit 'd1a1ea05ba3aa48fd65ea225d5c5c757232e4979':
  doc change: cherry pick c87f7a658e from master
2010-03-31 14:49:19 -07:00
Dirk Dougherty
d1a1ea05ba am 59e644e3: doc change: cherry pick c87f7a658e from master
Merge commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4' into froyo-plus-aosp

* commit '59e644e399e9a8dce48f28c34b5ed66974c41bd4':
  doc change: cherry pick c87f7a658e from master
2010-03-31 14:45:50 -07:00
Dirk Dougherty
59e644e399 doc change: cherry pick c87f7a658e from master 2010-03-31 14:24:34 -07:00
The Android Open Source Project
4790259c32 am 8de2cf4c: merge from open-source master
Merge commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102' into kraken

* commit '8de2cf4cce9ae2e121fccb4732fd23c64aace102':
  Fix last character of password field being visible after rotation
  gl_code : add end of line.
2010-03-31 14:17:32 -07:00
The Android Open Source Project
8de2cf4cce merge from open-source master
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
2010-03-31 14:01:45 -07:00
Jean-Michel Trivi
f788add075 am 93511f38: am 3ce1648f: Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
Merge commit '93511f384b1180bf5277a26ceeff568fa6aa858d' into kraken

* commit '93511f384b1180bf5277a26ceeff568fa6aa858d':
  Fix bug 2553575 API REVIEW: android.media  Change 1 of 3
2010-03-31 13:49:56 -07:00
Jean-Michel Trivi
93511f384b am 3ce1648f: Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
Merge commit '3ce1648fce73496c6ea6a208e5d13141ff7f34e1' into froyo-plus-aosp

* commit '3ce1648fce73496c6ea6a208e5d13141ff7f34e1':
  Fix bug 2553575 API REVIEW: android.media  Change 1 of 3
2010-03-31 13:44:20 -07:00
Jean-Michel Trivi
3ce1648fce Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo 2010-03-31 13:40:42 -07:00
Jean-Michel Trivi
7f7e67f1b6 Fix bug 2553575 API REVIEW: android.media Change 1 of 3
Notes from API Council review:
  Rename onAudioFocusChanged -> onAudioFocusChange

Change-Id: I8296cc84381506dabe8a9ceb1b5e3c0ab6d4af25
2010-03-31 12:08:26 -07:00
Andreas Huber
ed46ba262b am 41e8e4a2: am 804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
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.
2010-03-31 11:44:01 -07:00
Andreas Huber
41e8e4a29d am 804878f3: Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
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.
2010-03-31 11:38:54 -07:00
Andreas Huber
804878f3a3 Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo 2010-03-31 11:33:19 -07:00
Dianne Hackborn
8cb52c8a7d am bc50bdca: am e259bc77: Fix issue #2558391: Package manager problem when not replacing existing system partition app
Merge commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16' into kraken

* commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16':
  Fix issue #2558391: Package manager problem when not replacing existing system partition app
2010-03-31 11:17:01 -07:00
Dianne Hackborn
bc50bdca0a am e259bc77: 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
2010-03-31 11:14:13 -07:00
Andreas Huber
0d34d8b4d5 Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality.
Change-Id: I30b93b21de9bd5509b617cca21f46331562c30ac
related-to-bug: 2553445
2010-03-31 11:08:23 -07:00
Dianne Hackborn
e259bc770b 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
2010-03-31 11:07:47 -07:00
Fred Quintana
92065ad772 am fa41ccf1: am 9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Merge commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152' into kraken

* commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152':
  added a cleanspec since ActiveSyncInfo.aidl was removed
2010-03-31 11:07:38 -07:00
Patrick Scott
e4424326ce am 09c49a8a: am 92534469: Use case insensitive matching.
Merge commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510' into kraken

* commit '09c49a8a6c3670126b2b9c477c5ac19cebdb9510':
  Use case insensitive matching.
2010-03-31 11:04:50 -07:00
Fred Quintana
fa41ccf18c am 9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Merge commit '9b9a89a58f50c3004959c36252489fae54fb9c58' into froyo-plus-aosp

* commit '9b9a89a58f50c3004959c36252489fae54fb9c58':
  added a cleanspec since ActiveSyncInfo.aidl was removed
2010-03-31 11:04:48 -07:00
Fred Quintana
9b9a89a58f Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo 2010-03-31 11:01:41 -07:00
Patrick Scott
09c49a8a6c am 92534469: Use case insensitive matching.
Merge commit '9253446922d925f6a5453b60d539beed292921a7' into froyo-plus-aosp

* commit '9253446922d925f6a5453b60d539beed292921a7':
  Use case insensitive matching.
2010-03-31 11:00:39 -07:00
Fred Quintana
28d5e74b42 added a cleanspec since ActiveSyncInfo.aidl was removed
Change-Id: I1fb57d2a4d28211f0adaf8c1d184a8c5f7701d7f
2010-03-31 10:59:43 -07:00
San Mehat
6f63dd5dc8 framework: Hide StorageManager for froyo - do not merge
Change-Id: I9a871e49cc9e1accb28c7e4b76bb0796eaf26d7b
2010-03-31 10:46:42 -07:00
Patrick Scott
9253446922 Use case insensitive matching.
Use the lowercase version of the protocol.

Bug: 2560217
Change-Id: Ibfadf4ba363968df9caf22c9ab36f666ee44d1db
2010-03-31 13:36:47 -04:00
Eric Olsen
8d72c64404 am f26cf98f: am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit 'f26cf98ffa087670a5ad849d7dd3c568d4f03ec9' into kraken

* commit 'f26cf98ffa087670a5ad849d7dd3c568d4f03ec9':
  Add thermal shutdown.  If battery temp >= 68C.
2010-03-31 10:12:26 -07:00
Eric Olsen
f26cf98ffa am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit '711065587b46ea0279788757c49a273ff796f844' into froyo-plus-aosp

* commit '711065587b46ea0279788757c49a273ff796f844':
  Add thermal shutdown.  If battery temp >= 68C.
2010-03-31 10:07:36 -07:00
Eric Olsen
711065587b Merge "Add thermal shutdown. If battery temp >= 68C." into froyo 2010-03-31 10:04:24 -07:00
Andreas Huber
4f0be1a8f3 am c7418149: am 5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Merge commit 'c7418149fafc7ded51a527b1d756028b33af3ac0' into kraken

* commit 'c7418149fafc7ded51a527b1d756028b33af3ac0':
  Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
2010-03-31 09:54:12 -07:00
Andreas Huber
c7418149fa am 5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Merge commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690' into froyo-plus-aosp

* commit '5c1e96bbc7f71fc3512706af878599fdfbdb7690':
  Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
2010-03-31 09:51:33 -07:00
Andreas Huber
5c1e96bbc7 Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 2010-03-31 09:48:22 -07:00
Andreas Huber
8e2b941e7b Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour).
Change-Id: I64da5eb97c75b269b4668b3628ed0f05f2e36e51
related-to-bug: 2557482
2010-03-31 09:40:15 -07:00
Eric Olsen
6a362a97f7 Add thermal shutdown. If battery temp >= 68C.
Change-Id: I625fa47939d8ecc532457b5c6e13f91d83bfbcc5
2010-03-31 09:33:47 -07:00
Robert Greenwalt
f91120905a am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2' into kraken

* commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2':
  Fix HttpProxy.
2010-03-31 08:37:45 -07:00
Robert Greenwalt
676f70527d am 0a08b194: Merge "Fix HttpProxy." into froyo
Merge commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d' into froyo-plus-aosp

* commit '0a08b1948f1e93fc36af8913e6e87fbeb0e9a92d':
  Fix HttpProxy.
2010-03-31 08:35:16 -07:00
Robert Greenwalt
0a08b1948f Merge "Fix HttpProxy." into froyo 2010-03-31 08:32:03 -07:00
Bjorn Bringert
3a694c045f am 86f6f536: am 11a7ba36: Support for apps search in apps provider contract
Merge commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68' into kraken

* commit '86f6f536e04a6f90fddc2695282ffb3842dcbb68':
  Support for apps search in apps provider contract
2010-03-31 07:26:12 -07:00
Bjorn Bringert
86f6f536e0 am 11a7ba36: 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
2010-03-31 07:21:13 -07:00
Bjorn Bringert
11a7ba367f Support for apps search in apps provider contract
Bug http://b/issue?id=2559078

Change-Id: Ic0d3ac3af2ca5f066618e279786af2df11cd0113
2010-03-31 14:32:09 +01:00
Jeff Brown
a749f86974 Fix a previous bad merge.
Change-Id: I12e577873389d6200f8add252867e63dee2d2c3c
2010-03-31 00:43:36 -07:00
Jeff Brown
767225d820 resolved conflicts for merge of d9ee01a9 to kraken
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
2010-03-30 23:49:17 -07:00
Jeff Brown
d9ee01a95c am 07330791: Show SD unavailable icon for apps on SD when ejected.
Merge commit '07330791116513710d879c45b2f095cd314cbfd0' into froyo-plus-aosp

* commit '07330791116513710d879c45b2f095cd314cbfd0':
  Show SD unavailable icon for apps on SD when ejected.
2010-03-30 23:32:12 -07:00
Jeff Brown
0733079111 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
2010-03-30 22:20:42 -07:00
Dianne Hackborn
2e41ffe7cf am b19b6fec: am 966fcb81: Revert "fix [2542425] memory leak during video recording"
Merge commit 'b19b6fec04de14860efb47d59084a66bb288cc98' into kraken

* commit 'b19b6fec04de14860efb47d59084a66bb288cc98':
  Revert "fix [2542425] memory leak during video recording"
2010-03-30 21:13:21 -07:00
Dianne Hackborn
b19b6fec04 am 966fcb81: Revert "fix [2542425] memory leak during video recording"
Merge commit '966fcb81eece9096040ccc185bb662335d3964cf' into froyo-plus-aosp

* commit '966fcb81eece9096040ccc185bb662335d3964cf':
  Revert "fix [2542425] memory leak during video recording"
2010-03-30 21:10:45 -07:00
Dianne Hackborn
966fcb81ee Revert "fix [2542425] memory leak during video recording"
This reverts commit 544592e14f.
2010-03-30 21:04:17 -07:00
Robert Greenwalt
f1cac90c7b Fix HttpProxy.
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
2010-03-30 19:15:32 -07:00
Mathias Agopian
9bb4473fbe am 65bfca37: am 544592e1: fix [2542425] memory leak during video recording
Merge commit '65bfca37fe36c1caef3153c39aa41a273ab776ef' into kraken

* commit '65bfca37fe36c1caef3153c39aa41a273ab776ef':
  fix [2542425] memory leak during video recording
2010-03-30 19:11:25 -07:00
Mathias Agopian
65bfca37fe am 544592e1: fix [2542425] memory leak during video recording
Merge commit '544592e14f8d7643238e40ba9879727497900f35' into froyo-plus-aosp

* commit '544592e14f8d7643238e40ba9879727497900f35':
  fix [2542425] memory leak during video recording
2010-03-30 19:06:51 -07:00
Mathias Agopian
544592e14f 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
2010-03-30 19:02:59 -07:00
Fred Quintana
6669a7b4b5 am 4a2f285d: am 77c560f3: - changed periodic sync scheduling to just creating pending 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
Merge commit '4a2f285deafc996435ac20162abaeb21838c1c40' into kraken

* commit '4a2f285deafc996435ac20162abaeb21838c1c40':
  - changed periodic sync scheduling to just creating pending
2010-03-30 18:42:20 -07:00