Merge commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken
* commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
A little more improvement of the Service javadoc.
Merge commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken
* commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72':
Fix SntpClient to give accurate time info.
Merge commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp
* commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
A little more improvement of the Service javadoc.
Merge commit 'bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp
* commit 'bf943f296864d9647268fb5a55805ebf1fcba173':
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
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
Merge commit 'e7d5a2f9ae47d8ea8face3f1e451314ed36f4026' into kraken
* commit 'e7d5a2f9ae47d8ea8face3f1e451314ed36f4026':
fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
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
Merge commit '454234657cd9b0835ecd9c6704cbcd5369e926b1' into froyo-plus-aosp
* commit '454234657cd9b0835ecd9c6704cbcd5369e926b1':
fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
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
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
This fixes problems with wakelock permissions introduced in an earlier change.
Change-Id: If0f4761ac27525d1eece0613c96be62f9e370a14
Signed-off-by: Mike Lockwood <lockwood@android.com>
