summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuchi Amalapurapu <asuchitra@google.com>2009-10-01 11:58:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-01 11:58:42 -0700
commitd3c63d9d1332711dd2da42281fbe74e063044fe3 (patch)
tree5455e683a2af270df146d83403d148580cd1c758
parent66fee5291b4db937cd8da02e3c3080052912941d (diff)
parent12a71058ea27d636076b2750dc49b4ef6b3ed328 (diff)
downloadandroid_packages_apps_PackageInstaller-d3c63d9d1332711dd2da42281fbe74e063044fe3.tar.gz
android_packages_apps_PackageInstaller-d3c63d9d1332711dd2da42281fbe74e063044fe3.tar.bz2
android_packages_apps_PackageInstaller-d3c63d9d1332711dd2da42281fbe74e063044fe3.zip
am 12a71058: am 3c9eac96: Clear installer\'s user data before downloading an app so that we get rid of any lingering files from earlier failed installs or files left behind by earlier buggy builds Add permission to AndroidManifest to clear user data
Merge commit '12a71058ea27d636076b2750dc49b4ef6b3ed328' * commit '12a71058ea27d636076b2750dc49b4ef6b3ed328': Clear installer's user data before downloading an app so that we get rid of any lingering files from earlier failed installs
-rw-r--r--AndroidManifest.xml1
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java2
2 files changed, 3 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5d35b0e2..21131455 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,6 +5,7 @@
<uses-permission android:name="android.permission.DELETE_PACKAGES" />
<uses-permission android:name="android.permission.CLEAR_APP_CACHE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
<application android:label="@string/app_name">
<activity android:name=".PackageInstallerActivity">
<intent-filter>
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index d63c98ee..3b429d94 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -356,6 +356,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
showDialogInner(DLG_UNKNOWN_APPS);
return;
}
+ // Clear any other temporary files in data directory
+ mPm.clearApplicationUserData(getPackageName(), null);
//compute the size of the application. just an estimate
long size;
String apkPath = mPackageURI.getPath();