Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Launching updated package after finishing package installer" into udc-qpr-dev

Browse Source
This commit is contained in:
Louis Chang
2023-06-01 03:43:29 +00:00
committed by Android (Google) Code Review
parent 35e9cb58e0 791697e5e7
commit d00511b73e
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/PackageInstaller/src/com/android/packageinstaller/DeleteStagedFileOnResult.java
View File

@@ -16,6 +16,8 @@
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;
@@ -45,6 +47,9 @@ 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

7
packages/PackageInstaller/src/com/android/packageinstaller/InstallSuccess.java
View File

@@ -17,7 +17,6 @@
package com.android.packageinstaller;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -123,11 +122,7 @@ public class InstallSuccess extends AlertActivity {
Button launchButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
if (enabled) {
launchButton.setOnClickListener(view -> {
try {
startActivity(mLaunchIntent);
} catch (ActivityNotFoundException | SecurityException e) {
Log.e(LOG_TAG, "Could not start activity", e);
}
setResult(Activity.RESULT_OK, mLaunchIntent);
finish();
});
} else {

6
packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java
View File

@@ -16,8 +16,9 @@
*/
package com.android.packageinstaller;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
import static android.content.Intent.FLAG_ACTIVITY_NO_HISTORY;
import static android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT;
import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.Manifest;
@@ -789,7 +790,8 @@ public class PackageInstallerActivity extends AlertActivity {
}
new Handler(Looper.getMainLooper()).postDelayed(() -> {
if (!isDestroyed()) {
startActivity(getIntent().addFlags(FLAG_ACTIVITY_REORDER_TO_FRONT));
startActivity(getIntent().addFlags(
FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP));
}
}, 500);