Merge "Delete staged APK whenever DeleteStagedFileOnResult finishes." into sc-dev am: afe3d75e1c am: 1c3ad7c6ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14234555

Change-Id: I469d1f409bbf17956e8047b29233f2e2a1d6f491

packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java

@@ -42,10 +42,17 @@ public class DeleteStagedFileOnResult extends Activity {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        File sourceFile = new File(getIntent().getData().getPath());
-        sourceFile.delete();
-
         setResult(resultCode, data);
         finish();
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (isFinishing()) {
+            File sourceFile = new File(getIntent().getData().getPath());
+            new Thread(sourceFile::delete).start();
+        }
+    }
 }