20635 Commits

Author SHA1 Message Date
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 544592e14f8d7643238e40ba9879727497900f35.
2010-03-30 21:04:17 -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
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
cba418b87a am c21e77fc: am 23243aca: missing current.xml change
Merge commit 'c21e77fc894360885310998a2eae69ab22779c39' into kraken

* commit 'c21e77fc894360885310998a2eae69ab22779c39':
  missing current.xml change
2010-03-30 18:29:32 -07:00
Fred Quintana
010fbfc984 am 344ba661: 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 -
Merge commit '344ba661ab406759a91ecaba1378a4907971b119' into kraken

* commit '344ba661ab406759a91ecaba1378a4907971b119':
  some changes due to an API review
2010-03-30 18:29:25 -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
c660ff5293 am 835f41da: (-s ours) am 8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Merge commit '835f41da7581747b6a03227bcd1e073074ea9329' into kraken

* commit '835f41da7581747b6a03227bcd1e073074ea9329':
  Add support for GPS privacy lock.  DO NOT MERGE
2010-03-30 17:35:18 -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
22d7142dd9 am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo
Merge commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken

* commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
  Don't load photo if it's id is 0. Saves one database query
2010-03-30 17:05:42 -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
e3d5f0f7e9 am 9ebc9f46: am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '9ebc9f464f45ec30003cd30854188a376c6d155f' into kraken

* commit '9ebc9f464f45ec30003cd30854188a376c6d155f':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
2010-03-30 16:54:43 -07:00
Christopher Tate
7738c5259c am 82a8b363: am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '82a8b3632c28d18d58a585160163fbf63d0c9746' into kraken

* commit '82a8b3632c28d18d58a585160163fbf63d0c9746':
  API CHANGE: @hide AbsoluteFileBackupHelper
2010-03-30 16:54:39 -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
591ad27d74 am 6d630607: am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo
Merge commit '6d63060768f9d73c6062a2b603d3c51c7d5f0043' into kraken

* commit '6d63060768f9d73c6062a2b603d3c51c7d5f0043':
  Fix issue #2553553: API REVIEW: android.context.Context
2010-03-30 16:05:05 -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
8fdebd35e5 am 9cfc52d9: am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
Merge commit '9cfc52d9f99f61c573ad845529265d4fb7a5842c' into kraken

* commit '9cfc52d9f99f61c573ad845529265d4fb7a5842c':
  Properly fill in the component name for the software decoders.
2010-03-30 15:49:38 -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
0e19e2b265 am e1331779: am 95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo
Merge commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5' into kraken

* commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5':
  Fix for Never not existing in latest timeout values.
2010-03-30 15:27:35 -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
be2059b0a0 am 19c1ea3b: am eb643f26: Merge "Remove the shadow under url bar." into froyo
Merge commit '19c1ea3bd05de6f0221b7807053bf03c3cfaaec7' into kraken

* commit '19c1ea3bd05de6f0221b7807053bf03c3cfaaec7':
  Remove the shadow under url bar.
2010-03-30 14:59: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
bdb59f66b9 am 295eb97c: am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
Merge commit '295eb97c7623105d6199fa91e58394e474a0abb1' into kraken

* commit '295eb97c7623105d6199fa91e58394e474a0abb1':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
2010-03-30 13:55:21 -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
b4915265a0 am ab86fc91: am de2722af: Merge "Package manager optimizations." into froyo
Merge commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a' into kraken

* commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a':
  Package manager optimizations.
2010-03-30 13:42:50 -07:00