summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuchi Amalapurapu <asuchitra@google.com>2009-09-14 13:02:49 -0700
committerSuchi Amalapurapu <asuchitra@google.com>2009-09-14 13:03:53 -0700
commit2f830ef28c014bff7766e8d82faf3ebf58a8cc14 (patch)
treefb08ac607e44e2ff1be183a0d43eab3f32e08ef2
parent3082595cc93da9b9b5da330343d1346785003723 (diff)
downloadandroid_packages_apps_PackageInstaller-2f830ef28c014bff7766e8d82faf3ebf58a8cc14.tar.gz
android_packages_apps_PackageInstaller-2f830ef28c014bff7766e8d82faf3ebf58a8cc14.tar.bz2
android_packages_apps_PackageInstaller-2f830ef28c014bff7766e8d82faf3ebf58a8cc14.zip
Finish UninstallerActivity after starting subactivity to actually uninstall which indicates progress etc., If not, the UninstallerActivity is again displayed
after finishing off uninstallation. Remove entries from manifest that are no longer part of code base
-rw-r--r--AndroidManifest.xml6
-rwxr-xr-xsrc/com/android/packageinstaller/UninstallerActivity.java1
2 files changed, 1 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 303897ad..5d35b0e2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,12 +15,8 @@
<data android:mimeType="application/vnd.android.package-archive" />
</intent-filter>
</activity>
- <activity android:name=".InstallAppConfirmation">
- </activity>
<activity android:name=".InstallAppProgress">
</activity>
- <activity android:name=".InstallAppDone">
- </activity>
<activity android:name=".UninstallerActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -31,7 +27,5 @@
</activity>
<activity android:name=".UninstallAppProgress">
</activity>
- <activity android:name=".UninstallAppDone">
- </activity>
</application>
</manifest>
diff --git a/src/com/android/packageinstaller/UninstallerActivity.java b/src/com/android/packageinstaller/UninstallerActivity.java
index 065da8b5..6310de8d 100755
--- a/src/com/android/packageinstaller/UninstallerActivity.java
+++ b/src/com/android/packageinstaller/UninstallerActivity.java
@@ -93,6 +93,7 @@ public class UninstallerActivity extends Activity implements OnClickListener,
mAppInfo);
newIntent.setClass(this, UninstallAppProgress.class);
startActivity(newIntent);
+ finish();
}
@Override