20965 Commits

Author SHA1 Message Date
Grace Kloba
3f73549bc8 Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo 2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
4183b514bb am c62cdef4: Merge "Rename logtag for clarity." into froyo
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp

* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
  Rename logtag for clarity.
2010-04-08 14:04:43 -07:00
Brad Fitzpatrick
c62cdef4ec Merge "Rename logtag for clarity." into froyo 2010-04-08 14:01:23 -07:00
Jeff Brown
a30b596d6a am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp

* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
  @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:49:55 -07:00
Jeff Brown
e760072a98 Improve robustness of package manager certificate collection.
The package manager contains an optimization which reuses cached
signatures instead of reloading them on startup if the package
appears to be unchanged.  This commit adds an extra check to ensure
that the PackageSettings object actually has valid signatures since
it has happened that they have gone missing.  Unfortunately it does
not address the root cause of the problem but it should alleviate the
symptoms after a reboot.

Bug: b/2547993
Change-Id: I41900c6a752711eb3a901360e3bb29aec946d0be
2010-04-08 13:49:17 -07:00
Jeff Brown
ec7c78fbf5 @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Bug: b/2553489
Change-Id: I681b3f9a243777b931298cc93c9d34c8d7eae0f2
2010-04-08 13:45:06 -07:00
Brad Fitzpatrick
228629e920 Rename logtag for clarity.
BUG=2581935

Change-Id: I85f0b704435861acd5a406ce5ec084b60696580c
2010-04-08 13:25:46 -07:00
Andreas Huber
b52e9f748c am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
Merge commit 'eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp

* commit 'eb12e45f7a92fd424988451256c82605d086245d':
  Refactor connection/redirection code, support redirects on reconnection.
2010-04-08 12:45:59 -07:00
Robert Greenwalt
6f72a313a0 am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
2010-04-08 12:45:51 -07:00
Andreas Huber
eb12e45f7a Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo 2010-04-08 12:44:33 -07:00
Robert Greenwalt
2b4b573801 Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:42:09 -07:00
Robert Greenwalt
9e696c29f0 Add service to monitor/control the flow of data.
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
2010-04-08 12:34:45 -07:00
Dianne Hackborn
2c5c9bb89b am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo
Merge commit '2670105ee6929d3036a1a7134400730f214f0f7e' into froyo-plus-aosp

* commit '2670105ee6929d3036a1a7134400730f214f0f7e':
  Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
2010-04-08 11:39:03 -07:00
The Android Open Source Project
727cec02da merge from open-source master
Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977
2010-04-08 11:35:37 -07:00
Dianne Hackborn
2670105ee6 Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:35:27 -07:00
The Android Open Source Project
65369424cb merge from open-source master
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
2010-04-08 11:27:55 -07:00
Scott Main
6b04d5c735 am 4981863d: Merge "docs: revisions to the installLocation documentation" into froyo
Merge commit '4981863de52941f053bf002ae2f9c8f705534599' into froyo-plus-aosp

* commit '4981863de52941f053bf002ae2f9c8f705534599':
  docs: revisions to the installLocation documentation
2010-04-08 11:25:36 -07:00
Scott Main
4981863de5 Merge "docs: revisions to the installLocation documentation" into froyo 2010-04-08 11:22:42 -07:00
Andreas Huber
aba965fdd8 Refactor connection/redirection code, support redirects on reconnection.
Change-Id: Id2517568000e028b01553c06a4893813a6883168
related-to-bug: 2580785
2010-04-08 10:09:35 -07:00
Jaikumar Ganesh
9e82d359bc am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo
Merge commit 'd1a95f975b03371a937da87735359c286a6de7f3' into froyo-plus-aosp

* commit 'd1a95f975b03371a937da87735359c286a6de7f3':
  Don't allow connection to profiles in TURNING_OFF state.
2010-04-08 10:08:25 -07:00
Jaikumar Ganesh
d1a95f975b Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:01:50 -07:00
Dianne Hackborn
af4c302a0a Fix issue #2580316: Contacts and Phone app not supporting landscape mode...
...when launched from car home launcher

For Eclair we made Droid a special case of treating the accelerometer as
a hard orientation indicator for the car dock.  This should really be the
default behavior, so make it so.

Change-Id: I70efb92036f86b55a436df29230253a192239adc
2010-04-08 09:52:51 -07:00
Andrei Popescu
1531d21124 am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Merge commit '3fe36fe589809b732db12054428166adb069f53b' into froyo-plus-aosp

* commit '3fe36fe589809b732db12054428166adb069f53b':
  Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
2010-04-08 09:10:09 -07:00
Andrei Popescu
3fe36fe589 Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 2010-04-08 09:07:32 -07:00
Andreas Huber
d06c435c3f am c6c8a1e9: Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error hand
Merge commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a' into froyo-plus-aosp

* commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a':
  Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
2010-04-08 08:31:20 -07:00
Andreas Huber
c6c8a1e96f Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection." into froyo 2010-04-08 08:27:20 -07:00
Andreas Huber
a51250bdc7 Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Change-Id: Ic9a6ef204362bc9afdc61e081c76bc62e5ef92ad
related-to-bug: 2580785
2010-04-08 07:51:20 -07:00
Andrei Popescu
31d2aa1e17 Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
It is now always called via the MediaPlayer.onCompletion() callback.

Fix b: 2533272

Change-Id: If86cf6b2ab355ddcd976cd6a2ad92ce071a1af33
2010-04-08 15:19:22 +01:00
Daniel Sandler
6fec76a081 am 8d318958: Merge "Transparent alarm icons for lockscreen." into froyo
Merge commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8' into froyo-plus-aosp

* commit '8d318958a3eb3abac3696c436e27e51e0bc2c6f8':
  Transparent alarm icons for lockscreen.
2010-04-08 06:10:12 -07:00
Daniel Sandler
070237771e am 9f71025b: Merge "Add emergency call button to PUK\'d lockscreen." into froyo
Merge commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7' into froyo-plus-aosp

* commit '9f71025b376a0c43d49b5c9c3f3f83942fd2f9b7':
  Add emergency call button to PUK'd lockscreen.
2010-04-08 06:10:09 -07:00
Daniel Sandler
8d318958a3 Merge "Transparent alarm icons for lockscreen." into froyo 2010-04-08 06:07:57 -07:00
Daniel Sandler
9f71025b37 Merge "Add emergency call button to PUK'd lockscreen." into froyo 2010-04-08 06:06:50 -07:00
Dianne Hackborn
a327dbddcc am ecb0e637: Fix issue #2541849: System crash when an app with active notifications...
Merge commit 'ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp

* commit 'ecb0e637870553f9c12dc6b9178de0512563af9c':
  Fix issue #2541849: System crash when an app with active notifications...
2010-04-07 22:39:18 -07:00
Dianne Hackborn
ecb0e63787 Fix issue #2541849: System crash when an app with active notifications...
...in status bar is installed on sdcard and device is powered down.

Don't do the GC until everyone has had a chance to take care of external
storage going away.

This is more correct, but doesn't completely fix the problem that
appears when shutting down.

Change-Id: I24b19337ba6262cfd8d010645dbf67e76ea03058
2010-04-07 22:19:55 -07:00
Wu-cheng Li
75a9cbaea4 am 3f4639a6: Update API and javadoc according to API review.
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp

* commit '3f4639a6611222ae1ae5493de49213250d292139':
  Update API and javadoc according to API review.
2010-04-07 21:58:21 -07:00
Wu-cheng Li
3f4639a661 Update API and javadoc according to API review.
bug:2553570
Change-Id: I0353938f513c119cec0e31eb980dc4569e17d7eb
2010-04-08 12:31:06 +08:00
Suchi Amalapurapu
a599469f90 am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp

* commit 'c2461be6279137f872becf695befeb7ba8770a64':
  Fix 2579461
2010-04-07 21:29:05 -07:00
Suchi Amalapurapu
c2461be627 Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 2010-04-07 21:24:36 -07:00
Suchi Amalapurapu
40e472521a Fix 2579461
Move install location values to secure settings.
Diable attribute for UI. Set default value to auto.
Add command line interface to set install location via pm.

Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
2010-04-07 20:43:54 -07:00
Grace Kloba
524aab57cd For performance reason, we choose to block the picture
update during drag and fling. For sites like nytimes.com,
there is a JavaScript constantly updating the content.
If we don't block the live update during drag/fling,
frame rate can drop by 30%.

This essentially reverted the CL for http://b/issue?id=2310295.
But as we honor preventDefault on touch move now,
the two sites mentioned in that bug do not have problem
even after this CL.

Fix http://b/issue?id=2574172
2010-04-07 20:32:01 -07:00
Dianne Hackborn
822a7e2def am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp

* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
  Fix issue #2578244: playing audio file downloaded by the browser...
2010-04-07 19:07:54 -07:00
Dan Egnor
2b4abcd0c7 Change TrafficStats to a new JNI implementation.
Also change phone's ConnectionStateTrackers to use it directly,
rather than through the INetStat binder interface.

Bug: 2578938
Change-Id: I8858e2609cbec3be845a0ce5178cb03f67e01b41
2010-04-07 19:06:29 -07:00
Dianne Hackborn
ce59fb8b68 Fix issue #2578244: playing audio file downloaded by the browser...
...shows an image downloaded by the browser

The downloads directory needs to be non-plural for backwards compatibility.

Change-Id: Ifb6ddf8ee980a57ad113a5fc8b51f5acd8df5955
2010-04-07 19:02:13 -07:00
Grace Kloba
520d684093 am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Merge commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp

* commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
  Revert "Use the content width to calculate the zoom overview"
2010-04-07 19:00:40 -07:00
Grace Kloba
667543cdb5 Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 18:57:52 -07:00
Dianne Hackborn
b37abe3867 am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Merge commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed' into froyo-plus-aosp

* commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed':
  Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
2010-04-07 18:41:42 -07:00
Grace Kloba
188bf8deb4 Revert "Use the content width to calculate the zoom overview"
This reverts commit 4a4f9886a789ece80f127397c1c7ad7f543b78fa.

Fix http://b/issue?id=2577238
2010-04-07 18:37:32 -07:00
Dianne Hackborn
d3cc496760 Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 2010-04-07 18:37:04 -07:00
Dianne Hackborn
4887993381 am 390022b2: Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo
Merge commit '390022b23b2c53119ff0bde4b14d14728bc48bb2' into froyo-plus-aosp

* commit '390022b23b2c53119ff0bde4b14d14728bc48bb2':
  Fix issue #2528537: android.os.DeadObjectException
2010-04-07 18:33:23 -07:00
Dianne Hackborn
390022b23b Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 2010-04-07 18:31:06 -07:00