21330 Commits

Author SHA1 Message Date
Grace Kloba
aa373c9868 Missed a case to resumeUpdatePicture.
Fix http://b/issue?id=2603882
2010-04-16 15:49:36 -07:00
Vasu Nori
1fc46c623f Merge "accept close() on database objects even if the database is closed" into froyo 2010-04-16 14:48:47 -07:00
Vasu Nori
0dbb9cee58 accept close() on database objects even if the database is closed
bug:2602878
Change-Id: I3075f801ef35d72792ff3daaa1e887e53b58f5f8
2010-04-16 14:24:57 -07:00
Carl Shapiro
d5a873fbe8 Merge "Add command line flags to enable lock profiling." into froyo 2010-04-16 13:25:03 -07:00
Mike Reed
f066611aab retool resize logic to use max dimension and max area.
Change-Id: I32446b41afe9e7c241868c0cb7b9b7d9056b2d38
http://b/issue?id=2598253
2010-04-16 15:19:02 -04:00
Mike LeBeau
0c5ad4f1b3 Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo 2010-04-16 07:23:12 -07:00
Carl Shapiro
d8f3ec6e83 Add command line flags to enable lock profiling. 2010-04-15 22:42:17 -07:00
Robert Greenwalt
e80c6f49d5 Merge "Add multi-sim support to ThrottleService." into froyo 2010-04-15 17:37:55 -07:00
Robert Greenwalt
e6e9882341 Add multi-sim support to ThrottleService.
Uses the last used data until the SIM is available (if ever).  Supports data from
several SIMs for all the world travelers out there.

bug: 2576057
Change-Id: I70e34a51f1c2ccda41a480652b0233b68ff3f538
2010-04-15 17:23:59 -07:00
Dianne Hackborn
e3094117a0 Merge "A little more improvement of the Service javadoc." into froyo 2010-04-15 13:33:21 -07:00
Robert Greenwalt
bf943f2968 Merge "Fix SntpClient to give accurate time info." into froyo 2010-04-15 13:28:43 -07:00
Robert Greenwalt
499a121c13 Fix SntpClient to give accurate time info.
Old calc was off by 2x and was affected by the user-settable system clock.  The error
came because it was calculating the offset between our clock and the NTP clock and the algebra
had two factors of the offset instead of the desired 1.

bug:2600010
Change-Id: I0856091d32b50e6909e4889fb98df819e0aeabbe
2010-04-15 12:31:55 -07:00
Dianne Hackborn
ee3bcc4c64 A little more improvement of the Service javadoc.
Change-Id: I15fb191a26f2ef86a2bf553177cb2d08905adb1c
2010-04-15 12:22:01 -07:00
David 'Digit' Turner
4f99e3c284 Remove native binaries when an updated system application is upgraded through OTA.
The point of this patch is to deal with the following case:

- A system application exists in the system partition. As such its
  native code lies under /system/lib

- An upgrade for it is installed through Market and overrides the
  version on the system partition. This places its native libraries
  under /data/data/<pkgname>/lib/

- Finally, the system is upgraded through an OTA, with an even more
  recent of the system application. We thus must remove the Market
  package as well as the native libraries that are in <dataDir>/lib
  since the new versions in /system/lib will be more recent.

The patch itself removes the files in <dataDir>/lib when such a
situation is detected. Note that this directory is created by the
PackageManager service and owned by the 'system' userID. The application
cannot create files there so simply erasing the content of the directory
is enough (and avoids reparsing the market package file to list
the installed binaries).

The patch also fixes a different issue which can be reproduced with:

- have system app installed on /system partition
- install an update (e.g. adb install -r Term.apk)
- uninstall the update (e.g. adb uninstall com.android.term)

the logcat shows that the PackageManager will unpack the native libraries
from the original /system/app/Term.apk into <dataDir>/lib, while they
already are in /system/lib. The patch fixes that too.

Change-Id: I5dfe27b91b6b31972e9cd4c196d15c3692732127
2010-04-15 10:35:25 -07:00
Mike LeBeau
70b3fb4a77 For search suggestions in the search dialog, allow the 'title'
line of text to be up to 2 lines (rather than the usual 1) if
no 'description' line is provided.

Change-Id: Ibc60d72868a4ad9630d38ee9b8cfe3f37c736e64
2010-04-15 11:35:47 -04:00
Kenny Root
fa22de7993 Merge "Import revised translations" into froyo 2010-04-15 05:55:00 -07:00
Mike Lockwood
93597ed183 Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 2010-04-15 05:45:21 -07:00
Dianne Hackborn
90d3f458d9 API 8!
Change-Id: I30a6a99f63a81900751f2afccf03430ddef82833
2010-04-14 22:08:29 -07:00
Kenny Root
40d255112e Import revised translations
Change-Id: Icdbd0bf88b18870dd3b063126e4559f6af3138a6
2010-04-14 20:30:39 -07:00
Robert Greenwalt
8090edae9e Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 2010-04-14 20:23:45 -07:00
Suchi Amalapurapu
deb69370ef Revert "Add ordered broadcast when removing packages."
Couple of cosmetic fixes as well.

This reverts commit 0c1285fa979e8b8c170f31d0ef1b4e5d9ddcf6b1.

Conflicts:

	services/java/com/android/server/PackageManagerService.java

Change-Id: Ife0f9f80525f4a41b1f8c12ffc2de62e061e7d5b
2010-04-14 19:58:22 -07:00
Dianne Hackborn
b0ef144286 Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo 2010-04-14 19:02:00 -07:00
Dmitri Plotnikov
5304d8fdc9 Merge "Introducing "strict project map"." into froyo 2010-04-14 18:33:54 -07:00
Suchi Amalapurapu
28b2fdc5ee Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard is filled up. If nothing is specified ie install location is set to let system decide, we just check on internal storage. Fix tests" into froyo 2010-04-14 18:28:22 -07:00
Suchi Amalapurapu
315a5fb91d Dont fall back to installing on sdcard when internal storage is filled up
when the install location is set to internal only. Similary if install
location is set to external only(via adb), dont fall back to installing on
internal storage if sdcard is filled up.
If nothing is specified ie install location is set to let system decide,
we just check on internal storage.
Fix tests

Change-Id: I7400ccc131782d9c45284bd9ebd0dee43a3b412b
2010-04-14 18:24:06 -07:00
Mathias Agopian
454234657c Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo 2010-04-14 18:18:44 -07:00
Suchi Amalapurapu
40b6996a8f Merge "Add ordered broadcast when removing packages." into froyo 2010-04-14 18:11:34 -07:00
Dianne Hackborn
b67fa45c26 Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
Make sure, if an activity is started with clear task when reset, if that
activity is finished in the middle of a stack that the behavior is retained
by propagating it to the next activity.

Change-Id: Ie31b8f968558b0e64e0ef7efa55950a722c6afa5
2010-04-14 18:01:43 -07:00
Robert Greenwalt
8c7e609b53 Sholes mobile iface comes/goes - handle the reset
The byte counter for the iface goes to zero when it comes back.  Catch that and
do the complex math to correct.

Also add a log entry telling us our desired throttle index.

Lastly, reset the sec/msec part of our reset time so that one calc will == another and not
be off by little bits.

bug:25494925
Change-Id: I99525b72a76316a8e601ceb457ca202fae040bae
2010-04-14 17:31:20 -07:00
Suchi Amalapurapu
0c1285fa97 Add ordered broadcast when removing packages.
Change-Id: I30a84068fa8f2b15564b0a164d339ac95f40e801
2010-04-14 17:13:50 -07:00
Mathias Agopian
967dce3062 fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
We now limit the size of the surface to the maximum size supported by the GPU.
On Nexus One this will 2048 -- it could be different on other devices.
Surface creation fails if the limit is exceeded.

Change-Id: I9ecfc2e9c58c9e283782b61ebfc6b590f71df785
2010-04-14 16:43:44 -07:00
Dmitri Plotnikov
40eb4aad2b Introducing "strict project map".
Change-Id: I147e10ac6475badf1d21e2c27d1cedbb27bd49df
2010-04-14 16:10:22 -07:00
Vasu Nori
0bbcdc6c5f Merge "verify database state before calling sqlite. Bug:2593970" into froyo 2010-04-14 15:53:43 -07:00
Tom O'Neill
8e4edb2862 cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54
(plus other revisions to resolve bug 2595831)

Minor fixes in hello-tabwidget.jd

Fix some typos, including a few that lead to non-functioning code.

Change-Id: I0057ec7d54836b38d2c7f7b12617327d911f0915
2010-04-14 14:35:36 -07:00
Grace Kloba
8a878dde9d Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don't trigger scroll." into froyo 2010-04-14 12:44:05 -07:00
Eric Laurent
758dd527f6 Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
This is a regression introduced by change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7 for issue 2472495.
When AudioService changes audio mode, setMode() reapplies current volume for the default active stream
which in this case is STREAM_RING.
Because the new implementation of silent mode actually mutes the ringer stream,
setStreamVolumeInt() now applies the volume change received while in silent mode
to the last audible value and we end up clearing the last audible volume for ringer.

The fix consists in not modifying last audible value when the new value is 0.

Also removed obsolete code in setStreamVolumeInt() since new implementation of setRingerModeInt()
in change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7.

Change-Id: I746f3bc1af39a602ce12d130ce592007b2d0ebb6
2010-04-14 10:52:01 -07:00
Eric Laurent
745b43c28f Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 2010-04-14 10:39:32 -07:00
Andrei Popescu
01e3feaf54 Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo 2010-04-14 10:26:58 -07:00
Dianne Hackborn
8656145e2a Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 2010-04-14 10:16:35 -07:00
James Dong
d3d445b1dc Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 2010-04-14 09:59:33 -07:00
Dianne Hackborn
399cccb857 Fix issue #593153: Broadcast time out when sending...
...ordered broadcast for ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE

Turns out this was because the broadcast receiver for ContextImpl was
not correctly being created, so when it received an ordered broadcast
it would not tell the activity manager when it was done.

This is now fixed, along with a ton of superficial changes to debug
output to help track this down and a little cleanup of dealing with
error cases in dispatching broadcasts.  Also a fix for a NPE when
dumping the broadcast state.

Finally, a little fiddling with package manager to get rid of a lot
of the noise when removing and re-adding packages on the SD card.

Change-Id: I961c14836dc613d3ea8122b6e910ef866e7fcb25
2010-04-14 09:54:21 -07:00
Eric Laurent
527c3ab51e Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
The problem happens only if volume down key is pressed while
already in silent or vibrate mode. In this case, AudioService accepts
changing the last audible index for ringer volume from 1 to 0.
When volume up is pressed, current ringer volume value is restored from 0
instead of 1.

The fix consists in keeping last audible index at 1 once in silent of vibrate
mode even is volume down key is pressed.

Change-Id: Id08edd12ce985c22233124545eba2c3e4b8cdc8e
2010-04-14 09:32:17 -07:00
Andrei Popescu
c4fbceb57b Make sure the onended event is dispatched even when
the user dismisses the video before it plays to completion.

Fix bug: 2533272

Change-Id: I73f216f4f416f5fdca0bbba2244b88666f8f6eac
2010-04-14 17:31:17 +01:00
Robert Greenwalt
22b3644ac2 Update the datause icons.
bug:2576057
Change-Id: Idf57d59aecb9bcff635dafa1e77d90a8737a0c08
2010-04-14 09:13:53 -07:00
Robert Greenwalt
9cb66e89cd Merge "Perist Throttle data across reboots" into froyo 2010-04-14 09:07:25 -07:00
James Dong
42d66573ff Use PV_PLAYER to handle RTSP streaming
bug - 2594865

Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
2010-04-14 08:57:14 -07:00
Leon Scroggins
b2212464a3 Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 2010-04-14 06:42:20 -07:00
Kristian Monsen
d503a1524a Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-14 02:22:18 -07:00
Kristian Monsen
53c0c0daf4 Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 2010-04-14 02:22:05 -07:00
Grace Kloba
50004bcd4b Pass WebKit scrollbar mode to Java. When scrollbar
is alwaysOff, don't trigger scroll.

If there is no horizontal and vertical scrollbar,
don't trigger the zoom control neither.

Fix http://b/issue?id=2512549
2010-04-13 22:58:51 -07:00