Commit Graph

13906 Commits

Author SHA1 Message Date
The Android Open Source Project
f22092a1eb am 4790259c: am 8de2cf4c: merge from open-source master 2010-03-31 14:23:19 -07:00
The Android Open Source Project
ad19edbdcd 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
45ef27a260 merge from open-source master
Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4
2010-03-31 14:01:45 -07:00
Jean-Michel Trivi
00b0b25339 am f788add0: 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 2010-03-31 14:01:07 -07:00
Jean-Michel Trivi
f4d7fb4bbe 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
ff46e2eed3 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
e4cdfce1be 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
Andreas Huber
47ca587845 am ed46ba26: 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 2010-03-31 11:50:37 -07:00
Andreas Huber
72439952fb 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
dee5c122f5 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
54de5d19bc 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
9416a191a3 am 8cb52c8a: am bc50bdca: am e259bc77: Fix issue #2558391: Package manager problem when not replacing existing system partition app 2010-03-31 11:23:56 -07:00
Dianne Hackborn
9ef810bce8 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
Fred Quintana
496aed9556 am 92065ad7: am fa41ccf1: am 9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo 2010-03-31 11:14:36 -07:00
Patrick Scott
cc2bcac6dc am e4424326: am 09c49a8a: am 92534469: Use case insensitive matching. 2010-03-31 11:14:33 -07:00
Dianne Hackborn
4b0a8055b8 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
Fred Quintana
b0cf8e24c2 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
a9536b912b 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
49e3f3ebcd 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
30bc0f57cb Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo 2010-03-31 11:01:41 -07:00
San Mehat
1f15d5c38f am 6f63dd5d: (-s ours) framework: Hide StorageManager for froyo - do not merge 2010-03-31 11:01:00 -07:00
Patrick Scott
46c2394a89 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
Eric Olsen
283cd91ee1 am 8d72c644: am f26cf98f: am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo 2010-03-31 10:18:15 -07:00
Eric Olsen
76fe6c5c90 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
2ea66597ef 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
c8e4213d9c Merge "Add thermal shutdown. If battery temp >= 68C." into froyo 2010-03-31 10:04:24 -07:00
Andreas Huber
da48b8d257 am 4f0be1a8: am c7418149: am 5c1e96bb: Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo 2010-03-31 10:03:15 -07:00
Robert Greenwalt
fe62ba145e am f9112090: am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo 2010-03-31 09:55:27 -07:00
Andreas Huber
674fd6f5a1 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
659623dd11 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
fffdeb00ae 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
Dirk Dougherty
5e0bf94803 Merge "doc change: Add updated Icon Guidelines and templates pack." 2010-03-31 09:38:37 -07:00
Robert Greenwalt
e45f2c5445 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
178ff3da72 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
8aaf5a5113 Merge "Fix HttpProxy." into froyo 2010-03-31 08:32:03 -07:00
Bjorn Bringert
0db9576f54 am 3a694c04: am 86f6f536: am 11a7ba36: Support for apps search in apps provider contract 2010-03-31 07:31:40 -07:00
Bjorn Bringert
174b935bdc 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
906bcf2176 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
Jeff Brown
be4326fe07 am a749f869: Fix a previous bad merge. 2010-03-31 00:56:05 -07:00
Jeff Brown
1a37989831 am 767225d8: resolved conflicts for merge of d9ee01a9 to kraken 2010-03-31 00:08:13 -07:00
Jeff Brown
8bf424f62d resolved conflicts for merge of d9ee01a9 to kraken
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
2010-03-30 23:49:17 -07:00
Jeff Brown
87ea1ee585 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
Dianne Hackborn
42b1bbd984 am 2e41ffe7: am b19b6fec: am 966fcb81: Revert "fix [2542425] memory leak during video recording" 2010-03-30 21:19:03 -07:00
Dianne Hackborn
34d563e124 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
6aa06014aa 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
c85e12e075 Revert "fix [2542425] memory leak during video recording"
This reverts commit 544592e14f8d7643238e40ba9879727497900f35.
2010-03-30 21:04:17 -07:00
Mathias Agopian
8a56503618 am 9bb4473f: am 65bfca37: am 544592e1: fix [2542425] memory leak during video recording 2010-03-30 19:16:41 -07:00
Mathias Agopian
38b0630853 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
09a906591f 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
77e26d6822 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