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

Commit 90fe92db authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "Fix unknown sources app install confirmation" into main am: 0f8f3c77 

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



Change-Id: I5af01eaf2fe1ea2c0c4409e358c813723cd4014c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ba16aa8 0f8f3c77

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

+5 −3
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ public class PackageInstallerActivity extends Activity { 
            final SessionInfo info = mInstaller.getSessionInfo(sessionId);

            String resolvedPath = info != null ? info.getResolvedBaseApkPath() : null;

            if (info == null || !info.isSealed() || resolvedPath == null) {

                Log.w(TAG, "Session " + mSessionId + " in funky state; ignoring");

                Log.w(TAG, "Session " + sessionId + " in funky state; ignoring");

                finish();

                return;

            }
@@ -400,7 +400,7 @@ public class PackageInstallerActivity extends Activity { 
                    -1 /* defaultValue */);

            final SessionInfo info = mInstaller.getSessionInfo(sessionId);

            if (info == null || !info.isPreApprovalRequested()) {

                Log.w(TAG, "Session " + mSessionId + " in funky state; ignoring");

                Log.w(TAG, "Session " + sessionId + " in funky state; ignoring");

                finish();

                return;

            }
@@ -820,7 +820,9 @@ public class PackageInstallerActivity extends Activity { 
                    // 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();

                    // Because finish() is overridden to set the installation result, we must use

                    // the original finish() method, or the confirmation dialog fails to appear.

                    PackageInstallerActivity.super.finish();

                }

            }, 500);