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

Commit ee5310c4 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Finish PIA if UnknownSourcesListener would like to start a PIA again"... 

Merge "Finish PIA if UnknownSourcesListener would like to start a PIA again" into udc-qpr-dev am: dda7ddf4

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



Change-Id: Id37243eef55489837c3b8b6be34a902cf29a882f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d10e5487 dda7ddf4

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

+6 −4
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 
*/

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_SINGLE_TOP;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.Manifest;
@@ -790,8 +788,12 @@ public class PackageInstallerActivity extends AlertActivity { 
            }

            new Handler(Looper.getMainLooper()).postDelayed(() -> {

                if (!isDestroyed()) {

                    startActivity(getIntent().addFlags(

                            FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP));

                    startActivity(getIntent());

                    // The start flag (FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP) doesn't

                    // work for the multiple user case, i.e. the caller task user and started

                    // Activity user are not the same. To avoid having multiple PIAs in the task,

                    // finish the current PackageInstallerActivity

                    finish();

                }

            }, 500);