Merge commit '32ebaf57d8646542b80e848441830a5ef834aed3' into kraken
* commit '32ebaf57d8646542b80e848441830a5ef834aed3':
Add multi-sim support to ThrottleService.
Merge commit 'e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp
* commit 'e80c6f49d5055e299b7ada91b5967feab66e467b':
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
Merge commit '7a4b22f6293c7dce2dd667b7ebd171af2eff91a9' into kraken
* commit '7a4b22f6293c7dce2dd667b7ebd171af2eff91a9':
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.
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
Couple of cosmetic fixes as well.
This reverts commit 0c1285fa979e8b8c170f31d0ef1b4e5d9ddcf6b1.
Conflicts:
services/java/com/android/server/PackageManagerService.java
Change-Id: Ife0f9f80525f4a41b1f8c12ffc2de62e061e7d5b
Merge commit '2ef6e44269ba3c9f6b5d22352461555ebab33b73' into kraken
* commit '2ef6e44269ba3c9f6b5d22352461555ebab33b73':
Dont fall back to installing on sdcard when internal storage is filled up
Merge commit '28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c' into froyo-plus-aosp
* commit '28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c':
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
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
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
This fixes problems with wakelock permissions introduced in an earlier change.
Change-Id: If0f4761ac27525d1eece0613c96be62f9e370a14
Signed-off-by: Mike Lockwood <lockwood@android.com>
Rather than holding a wake lock the entire time the GPS is active, we now
hold it only when messages are pending for GpsLocationProvider's Handler
and rely on the lower level implementation holding a wake lock when calling
into the provider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '11d7502b35374da12168004e277bcc87f4f7bb50' into kraken
* commit '11d7502b35374da12168004e277bcc87f4f7bb50':
Fix issue #593153: Broadcast time out when sending...
Merge commit 'b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4' into kraken
* commit 'b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4':
Perist Throttle data across reboots
Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp
* commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee':
Fix issue #593153: Broadcast time out when sending...
Merge commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp
* commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9':
Perist Throttle data across reboots
...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
Merge commit 'cd616247db69bdae8ab781be1f1d646ac7abf755' into kraken
* commit 'cd616247db69bdae8ab781be1f1d646ac7abf755':
Framework change for #2583442: Navigation dies when night mode changes
Merge commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e' into froyo-plus-aosp
* commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e':
Framework change for #2583442: Navigation dies when night mode changes
Merge commit 'fbd22f072b48be4b465085fb5354890e2f10fd32' into kraken
* commit 'fbd22f072b48be4b465085fb5354890e2f10fd32':
Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
The window manager doesn't retain its keep screen on lock while
in the process of destroying and creating new activity windows during
a config change. Now it does.
Unfortunately, this doesn't help maps, since it doesn't use our
lovely KEEP_SCREEN_ON flag. :p
Change-Id: Ida4bc0fcfe132cdff2bd4eeb7ba0ce9731504d14
Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp
* commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842':
Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
...SD card causes reboot.
Add option to not include temporarily unavailable recent tasks,
for the recent tasks UI to not display them.
Change-Id: I1495ca217b4292fd56f537459b44c0624262c292
