22657 Commits

Author SHA1 Message Date
Ben Murdoch
68a3ed59d0 Merge "Reset the webview settings after each test to ensure that each new test starts in a consistent, known state. This fixes a bug for example with the appcache tests, where disable.html turns off appcache support but it is never restored causing future tests to fail." 2010-04-15 17:08:04 -07:00
Mike Lockwood
1879d284bf GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed.
Change-Id: Iedf3f5ff333db7298de6cd6e86fface1f8421738
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-15 20:05:24 -04:00
android-build SharedAccount
120c457672 manual merge
Change-Id: I235ae925559b5db6d64cc8f8b188704a84d7b6a2
2010-04-15 16:36:34 -07:00
Mathias Agopian
699399775f Merge "when a zero dimension buffer is allocated, turn the allocation into a 1x1 buffer instead of Nx1 (or 1xN)" into kraken 2010-04-15 15:24:35 -07:00
Mathias Agopian
67bbac844d when a zero dimension buffer is allocated, turn the allocation into
a 1x1 buffer instead of Nx1 (or 1xN)

Change-Id: I27eeb15e83e13002dd9405f4e52b54f7dffc0fe7
2010-04-15 15:23:25 -07:00
Jake Hamby
145ff609de Spelling corrections and other minor cosmetic cleanups.
- Fixed a bunch of typos in comments (plus a few variable names)
- Removed unused import lines from telephony classes
- Added @Override attribute to overriding methods
- Made SmsMessage.PduParser inner class private & deleted unused constructor
- Added type specifiers to declarations of ArrayList and HashMap
- SimulatedCommands.getRegistrationState() had an ArrayIndexOutOfBoundsException
  trying to write to index 14 of a 14-element array. I removed the
  out-of-bounds assignment.

Change-Id: I054b5156aa64ab6639028d5b45a7e688b2deee08
2010-04-15 15:23:12 -07:00
Dianne Hackborn
f5678e911a Merge "Introduce new API version to avoid breakage with the Froyo APIs; introduce padding in the resources to avoid cross-branch merge pain." into kraken 2010-04-15 14:41:13 -07:00
Dianne Hackborn
cd0d10f939 Introduce new API version to avoid breakage with the Froyo APIs;
introduce padding in the resources to avoid cross-branch merge pain.

Change-Id: I9975f4320dfc625e3ed68dfdbbe94cc0c3b019f4
2010-04-15 14:38:30 -07:00
Shimeng (Simon) Wang
62d8a0f8a9 Merge "Convert obsolete language codes to new standards in Accept-Language and User-Agent." 2010-04-15 14:36:28 -07:00
Shimeng (Simon) Wang
0e4cb9d89f Convert obsolete language codes to new standards in Accept-Language and User-Agent.
Bug:2593415
Change-Id: I6b0bd161a0a2222da6ab7812614c1ba03d8c22eb
2010-04-15 14:25:49 -07:00
Dianne Hackborn
e02ffa34a8 am 292bdbd9: am e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken

* commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
  A little more improvement of the Service javadoc.
2010-04-15 13:39:16 -07:00
Robert Greenwalt
007302adeb am d65d5f11: am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken

* commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72':
  Fix SntpClient to give accurate time info.
2010-04-15 13:37:31 -07:00
Dianne Hackborn
292bdbd9c4 am e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp

* commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
  A little more improvement of the Service javadoc.
2010-04-15 13:36:44 -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
d65d5f114f am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit 'bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp

* commit 'bf943f296864d9647268fb5a55805ebf1fcba173':
  Fix SntpClient to give accurate time info.
2010-04-15 13:33:03 -07:00
Robert Greenwalt
bf943f2968 Merge "Fix SntpClient to give accurate time info." into froyo 2010-04-15 13:28:43 -07:00
Mathias Agopian
141264fabb am 24af70e8: am e7d5a2f9: am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo 2010-04-15 12:34:56 -07:00
Suchi Amalapurapu
50fa66c5b0 am 180ee659: am 1e21ec92: am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyo 2010-04-15 12:34:47 -07:00
Ben Murdoch
a8b9768a14 Reset the webview settings after each test to ensure that each new test starts
in a consistent, known state. This fixes a bug for example with the appcache
tests, where disable.html turns off appcache support but it is never restored
causing future tests to fail.

Change-Id: I71e2607d29ec6358cfdc6ab37a6861c161e84cd8
2010-04-15 12:34:18 -07:00
Mike Lockwood
2fe323f412 am 63aa5a6f: clear calling identity in GpsLocationProvider.sendExtraCommand(). 2010-04-15 12:34:15 -07:00
Mike Lockwood
89bdbc98e7 am a3d2d769: GpsStatus: Bounds check PRN to avoid array indexing exceptions. 2010-04-15 12:34:08 -07:00
Mike Lockwood
f1307b2ac4 am 04598b67: GPS: Support for GPS HAL managing its own scheduling 2010-04-15 12:34:01 -07:00
Mike Lockwood
17d820d876 am f440b4aa: Merge "GpsLocationProvider: optimize wake lock usage." into kraken 2010-04-15 12:33:49 -07:00
Patrick Scott
5383c2ba66 am 56645e26: Merge branch \'kraken\' of ssh://android-git:29418/platform/frameworks/base into kraken 2010-04-15 12:33:41 -07:00
Vasu Nori
119c106f8d am 9d3b3e13: am bad5f620: am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo 2010-04-15 12:33:34 -07:00
Grace Kloba
bf07bc932b am 8579f211: am e35a45b7: am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo 2010-04-15 12:33:26 -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
David 'Digit' Turner
ee193607a8 am 7a4b22f6: am 4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA.
Merge commit '7a4b22f6293c7dce2dd667b7ebd171af2eff91a9' into kraken

* commit '7a4b22f6293c7dce2dd667b7ebd171af2eff91a9':
  Remove native binaries when an updated system application is upgraded through OTA.
2010-04-15 12:23:59 -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
7a4b22f629 am 4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA.
Merge commit '4f99e3c28449833b10ee23c538246847fdb6a498' into froyo-plus-aosp

* commit '4f99e3c28449833b10ee23c538246847fdb6a498':
  Remove native binaries when an updated system application is upgraded through OTA.
2010-04-15 12:19:23 -07:00
Guang Zhu
287bf98077 add execution permission to "input" script
Although when building system image, "input" script will be given execution
permission, adb sync will push a version without x onto device from build
tree. Refer to frameworks/base/cmds/svc/svc, which has execution bit set.

Change-Id: I3e5bf0ce1a65133cb259d5c78456d36783c06b80
2010-04-15 10:58:48 -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
Adam Powell
212db7d3f8 Added MultiSelectListPreference
Added set support to XmlUtils; added Set<String> functions to SharedPreferences.

MultiSelectListPreference allows multiple selection and persistence of
string preferences. Addresses bug 2575634.

Change-Id: Icd56022d444b0ce43cccf819cd7d600fdb00e88a
2010-04-15 10:18:17 -07:00
Vasu Nori
062fc7ce36 allow apps to specify actions to take on database corruption error
let the user specify an interface impl class to specify the actions
to take when db corruption is detected.
this class is specified when the database is opened/created.

Change-Id: I84eb57208c8fedfa7235805b0ec58165efdc1560
2010-04-15 09:31:47 -07:00
Evan Millar
f82dcf4107 Merge "Clean up the fallback state of QuickContact" 2010-04-15 09:17:11 -07:00
Daniel Sandler
e54de6da82 Merge "Lockscreen improvements from froyo." 2010-04-15 08:38:55 -07:00
Daniel Sandler
368de81b71 Lockscreen improvements from froyo.
(In kraken as Ide3ad839.)

	I6872c3ad135bc34348adafa76e08a3878f1b506f
	"Add emergency call button to PUK'd lockscreen."
	Bug: 2568732

	I5ad8745443fc97225af9efb938e4640cfc29b5d7
	"Restore text field used by sliding tab to give ringer
	mode feedback."
	Bug: 2587358

Change-Id: I631d8e73571ccd566dc0ad80941bd739e614b9f6
2010-04-15 11:37:05 -04: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
Leon Scroggins III
dfbb1f4209 Call InputMethodManager.updateSelection at draw time.
Bug 2499860

Change-Id: Ie0b2a16c12ba59d30e3de5b614753e93b526d8cc
2010-04-15 11:14:32 -04:00
Kenny Root
95bf9f6a0f am 2349dc5d: am fa22de79: Merge "Import revised translations" into froyo
Merge commit '2349dc5d7aac9c0bde9fc38f69114db0f38ed319' into kraken

* commit '2349dc5d7aac9c0bde9fc38f69114db0f38ed319':
  Import revised translations
2010-04-15 06:43:29 -07:00
Eric Laurent
36b763e952 am 5c14f2d0: am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode. 2010-04-15 06:38:55 -07:00
Daniel Sandler
9fa47c0831 am a976eccf: Merge "Missing resources for lock screen." into kraken 2010-04-15 06:38:47 -07:00
Eric Laurent
491f250583 am 5db9adfd: am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 2010-04-15 06:38:39 -07:00
Andrei Popescu
7a8a91d1b0 am 0476f7a0: am 6083f5eb: am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo 2010-04-15 06:38:29 -07:00
Dianne Hackborn
97107f0497 am 093d621c: am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 2010-04-15 06:38:20 -07:00
James Dong
e3fcad3432 am fff02afa: am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 2010-04-15 06:38:10 -07:00
Robert Greenwalt
59019368cf am eaa8b1a7: am 57e60854: am 22b3644a: Update the datause icons. 2010-04-15 06:38:02 -07:00
Robert Greenwalt
f799996531 am c059f342: am b26c8dd4: am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo 2010-04-15 06:37:52 -07:00
Leon Scroggins
67329aa3ec am 7ba155bf: am 876a5dfe: am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 2010-04-15 06:37:43 -07:00
Kristian Monsen
c8c5363df3 am d2688cb1: am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-15 06:37:33 -07:00