20572 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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 544592e14f8d7643238e40ba9879727497900f35.
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
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
4a2f285dea 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 sync extra -
Merge commit '77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b' into froyo-plus-aosp

* commit '77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b':
  - changed periodic sync scheduling to just creating pending
2010-03-30 18:38:46 -07:00
Fred Quintana
77c560f3d7 - 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
  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=2531359
http://b/issue?id=2429638

Change-Id: I79805b582da74f4f0b6193eafaff24c2371d51e8
2010-03-30 18:31:27 -07:00
Fred Quintana
c21e77fc89 am 23243aca: missing current.xml change
Merge commit '23243acabdf8ff6022395cf67632c8387d286989' into froyo-plus-aosp

* commit '23243acabdf8ff6022395cf67632c8387d286989':
  missing current.xml change
2010-03-30 18:24:19 -07:00
Fred Quintana
344ba661ab am d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync - remove the a
Merge commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp

* commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b':
  some changes due to an API review
2010-03-30 18:24:15 -07:00
Fred Quintana
23243acabd missing current.xml change
Change-Id: I355dae4213ee8a93a79ff57e1d7c36d2b9d3495f
2010-03-30 18:16:40 -07:00
Mike Lockwood
835f41da75 am 8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Merge commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84' into froyo-plus-aosp

* commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84':
  Add support for GPS privacy lock.  DO NOT MERGE
2010-03-30 17:32:24 -07:00
Fred Quintana
d5e4fdc8a4 some changes due to an API review
- make EntityIterator extend Iterator and thus not throw a
   RemoteException, instead converting it into a RuntimeException.
 - rename ActiveSyncInfo to SyncInfo
 - change getActiveSync to getCurrentSync
 - remove the accessors in SyncInfo and instead make the final
   fields publicly accessible
 - made AbstractThreadedSyncAdapter.cancelSync not take a thread

Change-Id: I99fde5585bc5f1e95f4873ffbba189074a8d6372
http://b/issue?id=2553539
http://b/issue?id=2553541
http://b/issue?id=2553550
2010-03-30 17:31:52 -07:00
Mike Lockwood
8acdb911f4 Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo 2010-03-30 17:29:41 -07:00
Daniel Lehmann
1b679754b6 am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo
Merge commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp

* commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
  Don't load photo if it's id is 0. Saves one database query
2010-03-30 17:01:45 -07:00
Daniel Lehmann
58c9a4bca0 Merge "Don't load photo if it's id is 0. Saves one database query Bug:2546767" into froyo 2010-03-30 16:58:38 -07:00
Adam Powell
9ebc9f464f am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45' into froyo-plus-aosp

* commit '3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
2010-03-30 16:50:41 -07:00
Christopher Tate
82a8b3632c am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '27a63583bfb8b4668911a819f3c7827ef0cc2ec8' into froyo-plus-aosp

* commit '27a63583bfb8b4668911a819f3c7827ef0cc2ec8':
  API CHANGE: @hide AbsoluteFileBackupHelper
2010-03-30 16:50:36 -07:00
Adam Powell
3ac51b3d6f Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 2010-03-30 16:46:21 -07:00
Adam Powell
005c0a445e Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
AbsListView was relying on TOUCH_MODE_DOWN to signal that the item was
enabled, but onInterceptTouchEvent uses it for other purposes. Check
before dispatching the event.

Change-Id: I6babd3872cb51ebdba8e97a3b349e0cc08cd1279
2010-03-30 16:26:36 -07:00
Christopher Tate
27a63583bf API CHANGE: @hide AbsoluteFileBackupHelper
We don't want to publish this, but for risk mitigation we are hiding it
rather than rewriting/expanding the FileBackupHelper to accomodate the
absolute-path use cases that the system uses internally.

Change-Id: I513c97ec54de8dd7d28b10868d447d94b82d4ec3
2010-03-30 16:05:56 -07:00
Dianne Hackborn
6d63060768 am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo
Merge commit '5cdd78589db7f31c59df2e40146bd761a6570d13' into froyo-plus-aosp

* commit '5cdd78589db7f31c59df2e40146bd761a6570d13':
  Fix issue #2553553: API REVIEW: android.context.Context
2010-03-30 16:00:41 -07:00
Dianne Hackborn
5cdd78589d Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo 2010-03-30 15:55:37 -07:00
Andreas Huber
9cfc52d9f9 am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
Merge commit '99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc' into froyo-plus-aosp

* commit '99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc':
  Properly fill in the component name for the software decoders.
2010-03-30 15:44:23 -07:00
Andreas Huber
99e330b5a6 Merge "Properly fill in the component name for the software decoders." into froyo 2010-03-30 15:40:38 -07:00
Amith Yamasani
e133177980 am 95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo
Merge commit '95a321fcde17cbb79d89244eee3c1297c449b1a0' into froyo-plus-aosp

* commit '95a321fcde17cbb79d89244eee3c1297c449b1a0':
  Fix for Never not existing in latest timeout values.
2010-03-30 15:24:51 -07:00
Amith Yamasani
95a321fcde Merge "Fix for Never not existing in latest timeout values." into froyo 2010-03-30 15:19:00 -07:00
Amith Yamasani
b6e6ffae35 Fix for Never not existing in latest timeout values.
Bug: 2535288

Change-Id: I15ca60c7afe58fbe57e557e6d0028dc200d8b322
2010-03-30 15:04:19 -07:00
Grace Kloba
19c1ea3bd0 am eb643f26: Merge "Remove the shadow under url bar." into froyo
Merge commit 'eb643f2685bd404ef5abb622123cea0aa17939d7' into froyo-plus-aosp

* commit 'eb643f2685bd404ef5abb622123cea0aa17939d7':
  Remove the shadow under url bar.
2010-03-30 14:56:14 -07:00
Grace Kloba
eb643f2685 Merge "Remove the shadow under url bar." into froyo 2010-03-30 14:51:48 -07:00
Dianne Hackborn
acaf028fc9 Fix issue #2553553: API REVIEW: android.context.Context
Change-Id: I3e3ab7a909329d498544dc9ed4d500cbcc4ed281
2010-03-30 14:39:35 -07:00
Grace Kloba
397ffdfcb0 Remove the shadow under url bar.
This was introduced when we remove the over scroll.

Fix http://b/issue?id=2557916
2010-03-30 14:16:43 -07:00
Irfan Sheriff
295eb97c76 am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp

* commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
2010-03-30 13:51:46 -07:00
Andreas Huber
7167472d84 Properly fill in the component name for the software decoders.
Change-Id: I92071481f7ed94922b10856c981e507a9eec4c0c
related-to-bug: 2557787
2010-03-30 13:50:38 -07:00
Dianne Hackborn
ab86fc91f5 am de2722af: Merge "Package manager optimizations." into froyo
Merge commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8' into froyo-plus-aosp

* commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8':
  Package manager optimizations.
2010-03-30 13:40:24 -07:00
Irfan Sheriff
59610c041a cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
Setting the allowed channel count in the
driver can take a long time to potentially
cause ANR in the phone process. Make the call
asynchronous

Bug: 2555117
Change-Id: Ie3c2e6f90aa0ec8ee4b85c989ccae1ca0f2b94f9
2010-03-30 13:37:00 -07:00
Dianne Hackborn
de2722af35 Merge "Package manager optimizations." into froyo 2010-03-30 13:35:33 -07:00