diff options
| -rw-r--r-- | packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java | 5 | ||||
| -rw-r--r-- | packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java b/packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java index 19d74b33e034..7b17cbdd3a1e 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java @@ -16,8 +16,6 @@ package com.android.packageinstaller; -import static android.content.Intent.CATEGORY_LAUNCHER; - import static com.android.packageinstaller.PackageInstallerActivity.EXTRA_STAGED_SESSION_ID; import android.app.Activity; @@ -47,9 +45,6 @@ public class DeleteStagedFileOnResult extends Activity { protected void onActivityResult(int requestCode, int resultCode, Intent data) { setResult(resultCode, data); finish(); - if (data != null && data.hasCategory(CATEGORY_LAUNCHER)) { - startActivity(data); - } } @Override diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java index 9af88c3b4694..215ead367148 100644 --- a/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java +++ b/packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java @@ -18,6 +18,7 @@ package com.android.packageinstaller; import android.app.Activity; import android.app.AlertDialog; +import android.content.ActivityNotFoundException; import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -120,7 +121,12 @@ public class InstallSuccess extends Activity { Button launchButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE); if (enabled) { launchButton.setOnClickListener(view -> { - setResult(Activity.RESULT_OK, mLaunchIntent); + try { + startActivity(mLaunchIntent.addFlags( + Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP)); + } catch (ActivityNotFoundException | SecurityException e) { + Log.e(LOG_TAG, "Could not start activity", e); + } finish(); }); } else { |