Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fadc6521 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Launching updated package after finishing package installer" into... 

Merge "Launching updated package after finishing package installer" into udc-qpr-dev am: d00511b7 am: 753b3c1b

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



Change-Id: I326adce22387e5dd9cef1306ede030b3dfeb11a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0918d6d5 753b3c1b

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

+5 −0
Original line number Diff line number Diff line
@@ -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

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

+1 −6
Original line number Diff line number Diff line
@@ -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 {

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

+4 −2
Original line number Diff line number Diff line
@@ -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);