diff options
author | Kenny Root <kroot@google.com> | 2012-10-19 16:37:43 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-19 16:37:55 -0700 |
commit | 9bef3294d3660a85442829a25c9777e25d3c3cc8 (patch) | |
tree | e4ac279be0fcd872af6329c49239d2a70b40b582 /core | |
parent | 7e1664d44be6174c772fc3d2dc8ef9f5f5824390 (diff) | |
parent | cea3743499f4bb8e5f28a2e57686d7af313169c5 (diff) | |
download | frameworks_base-9bef3294d3660a85442829a25c9777e25d3c3cc8.zip frameworks_base-9bef3294d3660a85442829a25c9777e25d3c3cc8.tar.gz frameworks_base-9bef3294d3660a85442829a25c9777e25d3c3cc8.tar.bz2 |
Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev
* changes:
Try to free cache before giving up on install
Robustly add symlink and add for non-primary users
Diffstat (limited to 'core')
3 files changed, 17 insertions, 13 deletions
diff --git a/core/java/com/android/internal/app/IMediaContainerService.aidl b/core/java/com/android/internal/app/IMediaContainerService.aidl index c82834f7..03d3b22 100755 --- a/core/java/com/android/internal/app/IMediaContainerService.aidl +++ b/core/java/com/android/internal/app/IMediaContainerService.aidl @@ -36,4 +36,5 @@ interface IMediaContainerService { /** Return file system stats: [0] is total bytes, [1] is available bytes */ long[] getFileSystemStats(in String path); void clearDirectory(in String directory); + long calculateInstalledSize(in String packagePath, boolean isForwardLocked); } diff --git a/core/tests/coretests/apks/install_bad_dex/AndroidManifest.xml b/core/tests/coretests/apks/install_bad_dex/AndroidManifest.xml index fe4dd8e..76f0fe5 100644 --- a/core/tests/coretests/apks/install_bad_dex/AndroidManifest.xml +++ b/core/tests/coretests/apks/install_bad_dex/AndroidManifest.xml @@ -14,7 +14,7 @@ limitations under the License. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.frameworks.coretests.install_loc"> + package="com.android.frameworks.coretests.install_bad_dex"> <application android:hasCode="true"> <activity diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java index 56070ee..04f8009 100755 --- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java @@ -981,19 +981,22 @@ public class PackageManagerTests extends AndroidTestCase { try { DeleteObserver observer = new DeleteObserver(pkgName); - getPm().deletePackage(pkgName, observer, flags); + getPm().deletePackage(pkgName, observer, flags | PackageManager.DELETE_ALL_USERS); observer.waitForCompletion(MAX_WAIT_TIME); assertUninstalled(info); // Verify we received the broadcast - long waitTime = 0; - while ((!receiver.isDone()) && (waitTime < MAX_WAIT_TIME)) { - receiver.wait(WAIT_TIME_INCR); - waitTime += WAIT_TIME_INCR; - } - if (!receiver.isDone()) { - throw new Exception("Timed out waiting for PACKAGE_REMOVED notification"); + // TODO replace this with a CountDownLatch + synchronized (receiver) { + long waitTime = 0; + while ((!receiver.isDone()) && (waitTime < MAX_WAIT_TIME)) { + receiver.wait(WAIT_TIME_INCR); + waitTime += WAIT_TIME_INCR; + } + if (!receiver.isDone()) { + throw new Exception("Timed out waiting for PACKAGE_REMOVED notification"); + } } return receiver.received; } finally { @@ -1331,7 +1334,7 @@ public class PackageManagerTests extends AndroidTestCase { } DeleteObserver observer = new DeleteObserver(packageName); - getPm().deletePackage(packageName, observer, 0); + getPm().deletePackage(packageName, observer, PackageManager.DELETE_ALL_USERS); observer.waitForCompletion(MAX_WAIT_TIME); try { @@ -1357,7 +1360,7 @@ public class PackageManagerTests extends AndroidTestCase { if (info != null) { DeleteObserver observer = new DeleteObserver(pkgName); - getPm().deletePackage(pkgName, observer, 0); + getPm().deletePackage(pkgName, observer, PackageManager.DELETE_ALL_USERS); observer.waitForCompletion(MAX_WAIT_TIME); assertUninstalled(info); } @@ -3126,7 +3129,7 @@ public class PackageManagerTests extends AndroidTestCase { int rawResId = apk2; Uri packageURI = getInstallablePackage(rawResId, outFile); PackageParser.Package pkg = parsePackage(packageURI); - getPm().deletePackage(pkg.packageName, null, 0); + getPm().deletePackage(pkg.packageName, null, PackageManager.DELETE_ALL_USERS); // Check signatures now int match = mContext.getPackageManager().checkSignatures( ip1.pkg.packageName, pkg.packageName); @@ -3265,7 +3268,7 @@ public class PackageManagerTests extends AndroidTestCase { PackageManager pm = mContext.getPackageManager(); // Delete app2 PackageParser.Package pkg = getParsedPackage(apk2Name, apk2); - getPm().deletePackage(pkg.packageName, null, 0); + getPm().deletePackage(pkg.packageName, null, PackageManager.DELETE_ALL_USERS); // Check signatures now int match = mContext.getPackageManager().checkSignatures( ip1.pkg.packageName, pkg.packageName); |