22317 Commits

Author SHA1 Message Date
Mike Lockwood
48b8b4fd46 Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken 2010-04-15 20:26:33 -07:00
Mike Lockwood
ad903e8010 Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken 2010-04-15 20:26:09 -07:00
Jim Miller
318249e467 Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken 2010-04-15 17:55:18 -07:00
Jim Miller
5169fc57e3 Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04
Fix 2572446: Also watch keyboard changes in PIN/Password unlock.

The PIN/Password unlock screen was monitoring orientation changes.
However, while docked, this isn't useful since orientation remains
fixed. This change makes PasswordUnlockScreen also looks for
changes to config.hardKeyboardHidden.

Tested:
WVGA device while docked and opening/closing the keyboard.

Change-Id: Iaadb277028f2dd1f85fd0f627a686a86ac51a2ed
2010-04-15 17:53:23 -07:00
Jim Miller
43725d4d44 Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken 2010-04-15 17:47:01 -07:00
Robert Greenwalt
9e17d7408b am 32ebaf57: am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit '32ebaf57d8646542b80e848441830a5ef834aed3' into kraken

* commit '32ebaf57d8646542b80e848441830a5ef834aed3':
  Add multi-sim support to ThrottleService.
2010-04-15 17:45:26 -07:00
Robert Greenwalt
32ebaf57d8 am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit 'e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp

* commit 'e80c6f49d5055e299b7ada91b5967feab66e467b':
  Add multi-sim support to ThrottleService.
2010-04-15 17:42:24 -07:00
Mike Lockwood
d53ba017ee GpsLocationProvider: Eliminate MIN_FIX_COUNT.
Now we stop after one fix rather than waiting for 10 when requesting occasional
fixes to conserve power.

Change-Id: Ic420f2d20780db983fc4db22246e0a486eecc58e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-15 20:41:26 -04:00
Jim Miller
ecaced9a78 Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3
Fix 2575838: Update emergency button in AccountUnlockScreen DO NOT MERGE

AccountUnlockScreen wasn't registered to receive updates from
UpdateMonitor. It now correctly updates the Emergency call button
to allow the user to return to the call in progress (InCallScreen).

Tested on WVGA device with keyboard:
- hitting Home during call, observing state, and pressing button to return to call.
- hitting Home while not in call to ensure it still invokes EmergencyDialer.
- above in various keyboard states.

Change-Id: Ic4480ff69ff4479557ddb7f76c751b005b1c60bf
2010-04-15 17:39: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
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
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
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
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
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
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
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
Kenny Root
2349dc5d7a am fa22de79: Merge "Import revised translations" into froyo
Merge commit 'fa22de7993f94d338330a888bdc2aeaaf857c719' into froyo-plus-aosp

* commit 'fa22de7993f94d338330a888bdc2aeaaf857c719':
  Import revised translations
2010-04-15 06:00:18 -07:00
Kenny Root
fa22de7993 Merge "Import revised translations" into froyo 2010-04-15 05:55:00 -07:00
Mike Lockwood
b2378aaa07 am f5a886d5: am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Merge commit 'f5a886d5210320724236ce6efde926e0a3c24997' into kraken

* commit 'f5a886d5210320724236ce6efde926e0a3c24997':
  Fix wakelock leak in PowerManagerService.sendNotificationLocked()
2010-04-15 05:53:05 -07:00
Mike Lockwood
f5a886d521 am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Merge commit '93597ed1839de164c81f83832d4c2373ea32ac8f' into froyo-plus-aosp

* commit '93597ed1839de164c81f83832d4c2373ea32ac8f':
  Fix wakelock leak in PowerManagerService.sendNotificationLocked()
2010-04-15 05:48:26 -07:00
Mike Lockwood
93597ed183 Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 2010-04-15 05:45:21 -07:00
Dianne Hackborn
fa27f8c0d5 am ded77760: am 90d3f458: API 8!
Merge commit 'ded77760d1135cdc76f7c1fdf0e156165c1aeaf3' into kraken

* commit 'ded77760d1135cdc76f7c1fdf0e156165c1aeaf3':
  API 8!
2010-04-14 22:31:06 -07:00
Dianne Hackborn
ded77760d1 am 90d3f458: API 8!
Merge commit '90d3f458d99d9c0f35f9ee295997661c2493cb58' into froyo-plus-aosp

* commit '90d3f458d99d9c0f35f9ee295997661c2493cb58':
  API 8!
2010-04-14 22:27:10 -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
d38a767c92 am 1424d1d2: am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Merge commit '1424d1d22e199c716c5d248611e58ce7c3f15c7e' into kraken

* commit '1424d1d22e199c716c5d248611e58ce7c3f15c7e':
  Sholes mobile iface comes/goes - handle the reset
2010-04-14 20:30:31 -07:00
Suchi Amalapurapu
c260b08e59 am 0751d1ea: am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well.
Merge commit '0751d1eaad55603eaeb0f035a55935f713ab0476' into kraken

* commit '0751d1eaad55603eaeb0f035a55935f713ab0476':
  Revert "Add ordered broadcast when removing packages."
2010-04-14 20:30:27 -07:00
Robert Greenwalt
1424d1d22e am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Merge commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp

* commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729':
  Sholes mobile iface comes/goes - handle the reset
2010-04-14 20:25:51 -07:00
Suchi Amalapurapu
0751d1eaad am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well.
Merge commit 'deb69370ef9a786940ae49411ba657410361b4f1' into froyo-plus-aosp

* commit 'deb69370ef9a786940ae49411ba657410361b4f1':
  Revert "Add ordered broadcast when removing packages."
2010-04-14 20:25:48 -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
ccb87e11da am 68ca59e9: am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Merge commit '68ca59e9e69ab4c997987fb0390382a2461386eb' into kraken

* commit '68ca59e9e69ab4c997987fb0390382a2461386eb':
  Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
2010-04-14 19:09:52 -07:00
Dianne Hackborn
68ca59e9e6 am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Merge commit 'b0ef1442866ec52a772e6edfab732a2c987bbee0' into froyo-plus-aosp

* commit 'b0ef1442866ec52a772e6edfab732a2c987bbee0':
  Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
2010-04-14 19:05:11 -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
949c34854a am 13932d85: am 5304d8fd: Merge "Introducing "strict project map"." into froyo
Merge commit '13932d85066f191db09c4a2fecfa563f0d63d7b7' into kraken

* commit '13932d85066f191db09c4a2fecfa563f0d63d7b7':
  Introducing "strict project map".
2010-04-14 18:40:17 -07:00
Dmitri Plotnikov
13932d8506 am 5304d8fd: Merge "Introducing "strict project map"." into froyo
Merge commit '5304d8fdc9064f2831ef16db9242f17110287997' into froyo-plus-aosp

* commit '5304d8fdc9064f2831ef16db9242f17110287997':
  Introducing "strict project map".
2010-04-14 18:36:36 -07:00
Suchi Amalapurapu
7322b9f0e8 am 2ef6e442: am 28b2fdc5: 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 storag
Merge commit '2ef6e44269ba3c9f6b5d22352461555ebab33b73' into kraken

* commit '2ef6e44269ba3c9f6b5d22352461555ebab33b73':
  Dont fall back to installing on sdcard when internal storage is filled up
2010-04-14 18:34:21 -07:00